Android 4.1.2 release 2
Merge "Fix Mac build."