tree 9828fb9912b48be1864a7ba1e3ff14d2d9c6f629
parent 4786e4e24fb6a79feb5794453122536d837f0fa5
parent c78efd7113e7274414f9feb3c05f52f06797c358
author Alex Deymo <deymo@google.com> 1484261351 +0000
committer android-build-merger <android-build-merger@google.com> 1484261351 +0000

Merge changes from topic 'host_suffix_cleanup' am: 7e0b322978 am: 130546f2d0 am: ec72ff2b89
am: c78efd7113

Change-Id: Ibdaa9dcc3c77a36946485b255d0dbbf4747fafa2