android: cleanup

Change-Id: I6d78b3e64e495137c988a8a7fd4b753a32dfbfae