Merge "remove clang property from Android.bp files"