Android 4.1.1 release 5
Merge "Fix Mac build."