Merge changes from topic 'host_suffix_cleanup'

am: 7e0b322978

Change-Id: Ie3847326761f7a8c6019f19d8700cd1e9613b34d
This commit is contained in:
Alex Deymo 2017-01-12 21:33:00 +00:00 committed by android-build-merger
commit 130546f2d0

Diff Content Not Available