Update android build for latest OT into develop branch