Merge "camera: HidlMetadata.make remove comment"
am: 3c33b6e908

Change-Id: If41d39def885b3f55b72586ef059833c6d92a1fe