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

Change-Id: I67ad7adede8463fe3f670af949e9c3a4dc438c27