pick https://github.com/omxcodec/android_frameworks_base/commit/b9d83d

Change-Id: Ica5919d9d5199943c1a82f2caa059cce0f99883a