pick https://github.com/omxcodec/android_frameworks_base/commit/78c663

Change-Id: I82486bebb121fdc789dccaf82641695a462d2fce