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

Change-Id: I00c14b6d8528bee208d8e3fb815e10404811c64b