Merge "Make host targets use non-repackaged targets"
am: 6ba2231930

Change-Id: I0c03213cd351080d6bf7cbab4e6e49b83bc2d2b9