Merge "Instructions for using JDK 8 with aosp/master"
am: ed5eef749e

* commit 'ed5eef749e6b4fbce09a63a091a82e257829ecbb':
  Instructions for using JDK 8 with aosp/master