manifest: update to r3

Change-Id: Ie004a8440a04b735e0fc2c7dd97e84680223a34c
Signed-off-by: Evan Anderson <evan1124@gmail.com>
manifest: update to r3.1

Change-Id: I50817caf335e78e5c5e57a7bdb689ce3307edd87
Signed-off-by: Evan Anderson <evan1124@gmail.com>
Merge branch 'jb43-legacy' of https://github.com/ParanoidAndroid/manifest into PA