Merge "ahat: Target Java 1.7."