Android build fixes wip.