Merge "Hardware keymaster HAL should not indicate 'software'"