pick https://github.com/omxcodec/android_frameworks_base/commit/2c8276

Change-Id: Iaa0f04b43cd381f370fc0cd2effba933be668d15