Android build fix on-going