Revert "Remove Camera2 and Gallery2 from build"

This reverts commit 2603b59bb54da847907c092030cb5242c237ddae.