update TestCpp and extensions/Android.mk