Fix mac-android.sh to work with newer SDK tools.
Fix mac-android.sh to work with newer SDK tools.

This now uses the same logic as gce/linux-android.sh.

Change-Id: Ie66cff8061d8be2429f695ccd700cfc7101f6800

bazelbuild/continuous-integration,bazelbuild/continuous-integration,bazelbuild/continuous-integration,bazelbuild/continuous-integration,bazelbuild/continuous-integration,bazelbuild/continuous-integration,bazelbuild/continuous-integration,bazelbuild/continuous-integration