Changes for android libs build on Mac-OS host