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

Change-Id: I46dc871a2f4cb8bf8d9e3c222af0e110445ca956