Android 4.1.1 release 1.1
Merge "Fix Mac build."