Merge "Instructions for using JDK 8 with aosp/master"