Merge "Revert "Convert more of art to Android.bp""