Camera: Move Camera2 overlay at proper place

- Fixes a regression caused by change Ie7bec1c3
  where overlay paths are changed but omited to
  move Camera2 ones.

CRs-fixed: 606005
CRs-fixed: 567295
CRs-Fixed: 562465
Change-Id: I42c4f32b0f182e712169b4f9571d0352a000b00f
Removing unsupported targets from lunch combo

Cleaning up lunch combo by removing unsupported targets

Change-Id: Ib3db0d6671ab2cd7ed087cd4f7f586c1323833b1
Merge "Merge "Remove location related processes from init scripts""
Merge "Merge "Merge "Remove location related processes from init scripts"""
Merge "Removing unsupported targets from lunch combo"
Merge "Merge "Removing unsupported targets from lunch combo""
Merge "Merge "Merge "Removing unsupported targets from lunch combo"""
Merge "Merge "Removing unsupported targets from lunch combo""
Merge "Merge "Merge "Removing unsupported targets from lunch combo"""
Merge "Merge "Removing unsupported targets from lunch combo""
Merge "Merge "Merge "Removing unsupported targets from lunch combo"""
Merge "Merge "Removing unsupported targets from lunch combo""
Merge "Merge "Merge "Removing unsupported targets from lunch combo"""
Merge "Merge "Removing unsupported targets from lunch combo""
Merge "Merge "Merge "Removing unsupported targets from lunch combo"""
Merge "Merge "Removing unsupported targets from lunch combo""
Merge "Merge "Merge "Removing unsupported targets from lunch combo"""
Merge "Merge "Removing unsupported targets from lunch combo""
Merge "Merge "Merge "Removing unsupported targets from lunch combo"""
Merge "Camera: Move Camera2 overlay at proper place"