Android 4.1.1 release 2
Merge "Fix Mac build."