Android build work in progress