pick https://github.com/omxcodec/android_frameworks_base/commit/301112d75eaf63d8e3fd10e1712ada26994e3bc8

Change-Id: I735c570e911c6a7bd4c33e09dd61e4cb3c0cb4aa