pick https://github.com/omxcodec/android_frameworks_base/commit/7d637e76cb498cc776e4331c2ef20f640429a0be

Change-Id: Icbc0e68a3e1fdbfb4db4f43f6143b636a986d3ff