Merge "camera: HidlMetadata.make remove comment"