Merge "camera2: Clean up cross-references"