Merge "AAPT: Don't imply specific location hardware for dump badging" into nyc-mr1-dev am: 8dcd08ed am: de3ac160 Change-Id: Ibb0745f64337abfe1dcfd23fdc7186de5cbe121d