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