revert back to old Android.mk

Change-Id: Ic3d02b50789965270d33ff7dda20d48727babb9f