Merge of android and crystax 5beta3 NDK