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

Change-Id: I73c136f6ef87a4f56b65d615fe83595d055a47b8