Merge "Camera: Fix up metadata generation, including HIDL gen"