Adapt to change in detect_ostype inside pkg_install()

Change-Id: I1997752042e3f2a9a198289d5b536c95eaa89f03
Merge "Adapt to change in detect_ostype inside pkg_install()"