Change-Id: Ib764cb09bd78ab6e72c60f495d55b752ad4dbe4d
(cherry picked from commit 8e92d9e380a89b7443a2e2c3d16ce5a222e8c1e8) Conflicts: Android.mk makefile.unix src/dec/vp8l.c src/utils/Makefile.am