tree bb1660b5ca34363a4952b9deee3f7742208473aa
parent 204369ef1a8d953af77699adf9370adb8c9a71f2
parent 8031c2d2bb0881ef3c46aafdde87af47cc2fe595
author Alex Deymo <deymo@google.com> 1484256754 +0000
committer android-build-merger <android-build-merger@google.com> 1484256754 +0000

Merge changes from topic 'host_suffix_cleanup'
am: 8031c2d2bb

Change-Id: Ifcbf0829692fcac31c5246a07994be1ce0f6ba59