Merge "Buck: Adjust to upstream change: "default java targeted to be Java 7""