Merge "Revert "Convert libart and dependencies to Android.bp""