Merge "DO NOT MERGE libvpx: Cherry-pick 8b4c315 from upstream" into nyc-dev am: 104774bcff
am: e2a7f89f1f

Change-Id: I4b5f31243334e1a5470d285984d7145446b2b1d8