Merge "Adding apache-harmony to cts."