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

Change-Id: Ia50e676203e616b0fa07dfe52a7f1af541c1cc50