Merge: android: update compiler to use the "new" toolchain