am 9789c5f7: am f0eab404: am 9d14d317: Merge "Fix for Java 8 toolchain builds"

* commit '9789c5f7dffad0a9d14b671b9ed26e0dfb1c0242':
  Fix for Java 8 toolchain builds