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

Change-Id: I7b9bb7ad7b540642d95922ebb34e9d7fb5874011