AAPT: Fix feature split generation of ID resources am: 4d219da3c4 am: e69f9ca938
am: 84877752ee

Change-Id: I335e0fef88cd0ba7e1dd712c6659d7a799a34fbb