Merge changes If955ca61,I5eea619e

* changes:
  DO NOT MERGE Deleted clang property in Android.bp files
  DO NOT MERGE Auto formatting from bpfmt