pick https://github.com/omxcodec/android_frameworks_base/commit/97862b

Change-Id: Iaa7a32faa7e3d2001e529574f27be69b6cd04218