Merge "Convert more of art to Android.bp"