[1/2] Unify them Camera2&Gallery2 branches

Change-Id: I24f69c96cae50432c7a2f8104edf6e261037e084
Signed-off-by: Chintan Shah <cgintan1998@gmail.com>