Android 4.1.1 release 6
Merge "Fix Mac build."