Merge "Merge "Enable 64-bit camera VTS" into oc-dev am: 00533b9ace am: ac06b33a7d" into oc-dr1-dev-plus-aosp
am: 46824ff04b

Change-Id: I947032ca01274e58d029d5ef815413176455a54b