[TIMOB-14974] More work on the Android build.