Merge "Use PRODUCT_OUT/HOST_OUT instead of OUT/ANDROID_HOST_OUT"
am: 6f2edad5d9

Change-Id: I70d808f438581c2592eb12dc924107738303a603