Merge "AAPT: treat "-I" with lower precedence than main APK for dumping." into oc-mr1-dev