Generalize the fix in 2348779ae6 to apply to hosted as well as simulator builds. Original regression introduced in c0ac043c6d Change-Id: Ia786533cc318555e3bb842eb21a73a1f76888379
2348779ae6
c0ac043c6d