Android 4.1.2 release 1
Merge "Fix Mac build."