Merge "AAPT: Fixed split resource dumping" into pi-dev
am: fb07d82086

Change-Id: I66dedae28679c07e0bfa76cfafba97d563356fcb