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