Merge "DO NOT MERGE Verify OMX buffer sizes prior to access" into klp-dev am: d579ad0639 am: f0e76eb64b  -s ours am: 501ed9d  -s ours am: f50a3b4 am: d495a59
am: 0ab6ee3  -s ours

* commit '0ab6ee3e9996ba4d0a64fd9afe5814c93a304ad1':
  DO NOT MERGE Verify OMX buffer sizes prior to access