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

Change-Id: Idfef5422bbe3a3e46ceb1951e6393d2c80852930