Android 4.1.1 release 4
Merge "Fix Mac build."