pick https://github.com/omxcodec/android_frameworks_base/commit/538fc9c208025f3ec94496a3d95bd4db975ace2b

Change-Id: I3f0cf2969fc70be46260244a52cb3c8d38647407