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

Change-Id: I7659f9a8b2ae2486c7a96d49982b76540df12adc