Merge "Allow unknown codenames in target sdk version for APK-in-apexes" into tm-dev