tree 3ed942b9ce5b4cefa5cafa2e4d8a6054fd594624
parent da895981c3c80920967ec79cc60b0fd44417c7e9
parent 77cfd44da2ace647a46749ac76be8c654c0f5ed8
author Vignesh Venkatasubramanian <vigneshv@google.com> 1468267233 +0000
committer android-build-merger <android-build-merger@google.com> 1468267233 +0000

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

Change-Id: I090bd83ee9935e29d9030696581e513c585b8fb6