manually hand-pick from https://github.com/omxcodec/android_frameworks_base/commit/3fdc21 :'(

Change-Id: I389adecbd6c18324ef5b197059a355af0726a495