Android 4.1 CTS release 1
Merge "Fix Mac build."