Merge of android 4.2.2_r1 and crystax 5beta3 NDK