Fix master build: Android.mk automerged badly

Change-Id: I64a4d130107c8e777891f57b7594505b867ac79a
1 file changed