pick https://github.com/omxcodec/android_frameworks_base/commit/5d011e

Change-Id: Idc1d3c5b4d5174b7fd1a160fc5f45a5d062195fd