Android build updates for linux