[2/2] Unify them Camera2&Gallery2 branches

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