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

Change-Id: I7703de7cf6b5fd622a30975465713990d2b53376