This reverts commit 3fb5097a7eec40404760c304b36c8b657b374cab. libvpx is now fixed. (cherry-pick of 2be1be47aa9b63568fe6ce1e0a4029b37d90764d.) Bug: 15598056 Change-Id: Icca974e667f92206505f484bd291726eb0150f68