tree e1c025a24bdd9b737153d438972f1379e28d9a63
parent 9e93a79f4c708fcf2430a696dbfdbd66d1b5c430
parent f8f1a258503b5de16a44a14fae86101090e61e5f
author Alex Deymo <deymo@google.com> 1484256911 +0000
committer android-build-merger <android-build-merger@google.com> 1484256911 +0000

Merge changes from topic 'host_suffix_cleanup' am: 8031c2d2bb
am: f8f1a25850

Change-Id: I8b112d02b4a718ff258585e84fa4dfb3ba62dddc