Merge "Update the VHal emulator protobuf + misc nits"