AAPT: Handle gaps in resources when building splits
am: 26ae640c34

Change-Id: Ieb081dbc7e451415c2ada4fb7ce18bbfc6ea0fba