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