Merge "AAPT: Handle gaps in resources when building splits" into nyc-mr1-dev am: c1a36814e5
am: dcd8f86b19

Change-Id: Ia1cd4e6434a8ecb33e9b36c7f8f430711426190a