Merge \\\\\\\\\\\"OMXCodec: check IMemory::pointer() before using allocation\\\\\\\\\\\" into klp-dev am: f545c72b97 am: d89781f3be am: c9c40b829f am: 29f09eb295 am: 5d36fedeb8 am: a17d7c0307 am: 83d7bdbceb am: f43ad654dc am: b2aeed2dc5 am: e46d450cb7
am: f92f696230  -s ours

Change-Id: I010049c194e7530e6a936f2a882efb35b7227286