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

Change-Id: I94cf86e103f2dc7dd58b4e6954fc4a6097e8e8a5