Android 4.1.1 release 6.1
Merge "Fix Mac build."