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

Change-Id: I0e4c56797120a220b4d2c2199134b1a3474fa9a0