Merge "DO NOT MERGE | libvpx: Cherry-pick 0f42d1f from upstream" into lmp-dev am: 0786826966  -s ours am: bad06ba1bc am: e761daa19e am: dd05055da5  -s ours am: 095b27678c am: eff8f067cd am: 97b752f767
am: 7535a76b79  -s ours

Change-Id: I867afcf5de8352a926ea96cf40473ede518a73fd