DO NOT MERGE | libvpx: Cherry-pick 0f42d1f from upstream am: 000486a892  -s ours am: 4524039db8 am: 8b72f344db am: af3a803645  -s ours am: 372209fa1c am: d508c92ef5 am: 0a7c130c20 am: 6fb8680009  -s ours am: 4d70411098
am: de5cbe9b13

Change-Id: I86d51caca97af4479d868c30d79b05f99c7adff5