Merge "[Thread] add Android.bp format to make-pretty.sh" into main