android: cleanup

Change-Id: I1db3c20c68b8c2c69d76d8f1286e3be15091fb20