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

* commit '9d14d317c8b0f128903db72bfb1cfda0f3468280':
  Fix for Java 8 toolchain builds

xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build