Merge "Allow framework-res APK splits from Apexes"