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

Change-Id: I7232bfba59d7729b5535f3e867f3472782cbb65e