DO NOT MERGE omx: check buffer port before using am: ac26fe3a am: c3e02bb7...
DO NOT MERGE omx: check buffer port before using am: ac26fe3a am: c3e02bb7 am: 211f0825 am: f49f1613 -s ours
am: 46942461
Change-Id: Ic86d27875b7e4aeae9b2ecd55bdfd572e8e6887a