Bump revisions for new gcc lib paths

Closes #1384.

Signed-off-by: Ian Lancaster <ilancaster@gmail.com>
r: update 3.1.2_1 bottle.
Merge remote-tracking branch 'upstream/master'