Merge "Merge "AAPT: Fix feature split generation of ID resources" into nyc-mr1-dev am: 59a91c04cc am: 30e392e8b5" into nyc-mr1-dev-plus-aosp