Android: cleanup

Change-Id: Ia96872e6a126130a71aae8ee6efb90737d7fb037