Merge "creating a java7 target for car-lib so it can be used at compile time in google3" into nyc-car-dev