Android O IOT Preview 6 (4475743)
Merge "Follow renames of hamcrest-host and junit-host"
am: 7d750ea029

Change-Id: I39b6132cabcc084e29a5d2c983309d0e96dab380