Merge "Make print support lib support API24." into nyc-dev
am: 397f978e94

* commit '397f978e94d10beec504e6fdc0cabd98516ea4dc':
  Make print support lib support API24.

Change-Id: If7148a3060496253c68a7f9eed0f219c54c9491d