Android is now building correctly