Fix mismerge in Android.mk

Change-Id: Ica2de08d9b232f04b49f83327a40a5a227142345