sm7125-common: Build Camera2 app explicitly

* Pictures shot with Aperture are >80mb per pic, so switch back to Camera2 until we figure out whats wrong

Change-Id: I75c285ae7807659e20cd0f2757da0e4f21ad80b9

common.mk

@@ -118,7 +118,8 @@ PRODUCT_PACKAGES += \
     libgrallocusage.vendor \
     vendor.qti.hardware.camera.device@1.0.vendor \
     android.hardware.camera.device@3.6.vendor \
-    android.hardware.camera.provider@2.6.vendor
+    android.hardware.camera.provider@2.6.vendor \
+    Camera2
 
 # CAS
 PRODUCT_PACKAGES += \

overlay/packages/apps/Aperture/app/src/main/res/values/config.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- Enable auxiliary cameras selector. -->
-    <bool name="config_enableAuxCameras">true</bool>
-</resources>