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

Change-Id: Ife6892c7198815e498bf0b3240449fc5fed9eeaa