Merge "Do not check targetSdkVersion if only one package"