Android: cleanup

Change-Id: I2d1b75d2783038705cf0ae39d7e5dfc22a4851a4