pick https://github.com/omxcodec/android_frameworks_base/commit/183a49

Change-Id: If28b298350aaf2f0d98deeb3aa2b159404dde574