Merge "Update ProgramSelector to match HAL 2.0."