Merge "camera2: Update native<->managed camera metadata marshalers"