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

Change-Id: Iade00b560f883e29a555ee339625643ec8336071