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

Change-Id: Ic3287eaf37c5b457580f77048b22c9e2aec68612