Add Ubuntu patch to work around OpenJDK bug

Change-Id: Ide9497aeba2570c5151cd7f6e6e4cea6480d3885
Add Ubuntu patch to work around OpenJDK bug

Change-Id: Ide9497aeba2570c5151cd7f6e6e4cea6480d3885
Fixed Maps.java comment to reflect current code

Change-Id: I679123eada764a2b1d142f335d964ec653d99c07
Merge "Add Ubuntu patch to work around OpenJDK bug"
Merge "Fixed Maps.java comment to reflect current code"
Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/external/guava into mr1-staging

Change-Id: Idcb2624d0a9e27cc6d1028e77307292c188cbfbb