Merge "aapt2: Add command to rename overlay "targetPackage" attribute" into rvc-dev