Merge "Update default VHAL name in selinux policy."