Merge "Allow layoutlib to access core-libart"