Merge "4a-hal-reference: Tweak platform HAL packaging"