Merge "Fix bootstrap classpath in support library builds" into nyc-mr1-dev