Switch to composition over inheritance.

Switches v4l2_metadata over to the updated controls/properties
using inheritance over composition. Slight regression
in that the V4L2-based control factory method was removed,
will be replaced (and improved) in a CL soon.

BUG: 30140438
TEST: unit tests pass
Change-Id: I636fef67cd3ceeb3ebf9853d04b068988c4c4944
diff --git a/modules/camera/3_4/Android.mk b/modules/camera/3_4/Android.mk
index 7c8f430..1e7f4d6 100644
--- a/modules/camera/3_4/Android.mk
+++ b/modules/camera/3_4/Android.mk
@@ -41,7 +41,6 @@
   camera.cpp \
   metadata/enum_converter.cpp \
   metadata/metadata.cpp \
-  metadata/v4l2_enum_control.cpp \
   stream.cpp \
   stream_format.cpp \
   v4l2_camera.cpp \
@@ -53,20 +52,17 @@
 v4l2_test_files := \
   metadata/control_test.cpp \
   metadata/enum_converter_test.cpp \
-  metadata/fixed_property_test.cpp \
   metadata/ignored_control_delegate_test.cpp \
-  metadata/ignored_control_test.cpp \
   metadata/map_converter_test.cpp \
   metadata/menu_control_options_test.cpp \
   metadata/metadata_test.cpp \
   metadata/no_effect_control_delegate_test.cpp \
-  metadata/optioned_control_test.cpp \
+  metadata/property_test.cpp \
   metadata/ranged_converter_test.cpp \
   metadata/slider_control_options_test.cpp \
   metadata/tagged_control_delegate_test.cpp \
   metadata/tagged_control_options_test.cpp \
   metadata/v4l2_control_delegate_test.cpp \
-  metadata/v4l2_enum_control_test.cpp \
 
 # V4L2 Camera HAL.
 # ==============================================================================