Merge "Introduce ro.boot.hypervisor properties"