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

Change-Id: I54605bf1a1abeb5be0f13eac60224cda61deac55