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

Change-Id: Id0b7b2136e71f85abba3b2c256b1552db2749248