Merge "Convert clang to Android.bp"
am: 518deafd23

Change-Id: I1fccd0cd0ba5a03de7e8f5eb190c37dd169b6159