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