tree 14687532d378879d50e238873eff12a189c80a49
parent 866e72bf99cb9da24021f3f3a0dbea4f902c95cf
parent a6adbefa2c665880da65973ddead1fab857c1c4f
author Alex Deymo <deymo@google.com> 1484261297 +0000
committer android-build-merger <android-build-merger@google.com> 1484261297 +0000

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

Change-Id: Ife8bfd65d7d439fab60cd462fa272912a6fd99bf