manifest: update to r3.1

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