Merge changes I07c0f96d,I8734474f

* changes:
  Deleted clang property in Android.bp files
  autogenerated reformatting by bpfmt