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