Merge "Pin apache-harmony-tests{,-hostdex} to java_version 1.8"