Merge "Make print support lib support API24." into nyc-dev