DO NOT MERGE | libvpx: cherry-pick aa1c813 from upstream am: 5535027ad2 am: bd533cbdaf am: c611411947 am: 96f366e1f7  -s ours
am: 77cfd44da2

Change-Id: I090bd83ee9935e29d9030696581e513c585b8fb6