manifest: update to r3.1

Change-Id: I50817caf335e78e5c5e57a7bdb689ce3307edd87
Signed-off-by: Evan Anderson <evan1124@gmail.com>
Track these from CM

Since Privacy Guard support was reverted in these repos, we can track them straight from CM now.
Updated gerrit url
Fix url