Android build cleanups.