pick https://github.com/omxcodec/android_frameworks_base/commit/118fb07c98c392f978f4b443dd617904f06eb028

Change-Id: I4ae92cd06ff40566746f2acc4bdd7018b8490b1b