Merge "AAPT: Don't imply specific location hardware for dump badging" into nyc-mr1-dev
am: 8dcd08ed04

Change-Id: I78f9e151ec1705b65f6ed512973c63dcd826fec2