manifest: track CM Camera2 and Gallery2

Will revert if they start to go crazy on CAF merges

Change-Id: Icf86994302d4dd940fe1adada79793098730ef5d