Android CTS 4.1 Release 4
Merge "Fix Mac build."