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

Change-Id: I27f06a4102a0a766bf0083fea4f387d6908f78dd