tree e1c025a24bdd9b737153d438972f1379e28d9a63
parent 3cbb199e2475b69599e364b168955ffa72f40bed
parent a1e336d548ca78032c7e1d302e112134bfb83ba9
author Alex Deymo <deymo@google.com> 1484257210 +0000
committer android-build-merger <android-build-merger@google.com> 1484257210 +0000

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

Change-Id: Ic444b595aba05ccbd4eee3f92c4739fbd7c277fa