Merge "DO NOT MERGE | libvpx: Cherry-pick 0f42d1f from upstream" into klp-dev am: 32cee06116
am: 8ce8b100f5

Change-Id: I59ec4c447ba8e99de739d3843ea9b688c5d9af0e