Add Android.mk + cleanup

Change-Id: I2b54595a880a4836ae13a40ae270fcc14a62c492