Merge "Merge "DO NOT MERGE codecs: check OMX buffer size before use in...

Merge "Merge "DO NOT MERGE codecs: check OMX buffer size before use in (gsm|g711)dec" into klp-dev am: 7cab9536 am: f249b0fe am: 9345299e  -s ours am: cbc0d3ac  -s ours am: ece67a93 am: ad599498 am: fa64a212  -s ours am: 3b1a4359 am: 5ffd5fe4 am: fbab2e6e am: 7fe9a728  -s ours am: 4178befd am: e762ae4c  -s ours" into nyc-mr1-dev-plus-aosp