Android 4.1.1 release 3
Merge "Fix Mac build."