Fix AndroidProducts