manifests: Fix up cm projects to allow code review

Change-Id: I2b44db45657d964049e1356e10fd04a9a340953e
Signed-off-by: Evan Anderson <evan1124@gmail.com>
Merge remote-tracking branch 'vendorPA/jb43' into jb43

Conflicts:
	manifests/flo.adds

Change-Id: I35152d590459c782b84fc3b54328932f1827aa01