Remove the bloody Camera2 once again

Change-Id: I40b12a50ee80ae6827f0affc35f76b37a45de00d