Merge "Actually change api to use long in CollapsingToolbarLayout." into nyc-dev
am: 44e80233cd

* commit '44e80233cd489c516301c00c53b3578b979f4807':
  Actually change api to use long in CollapsingToolbarLayout.

Change-Id: I5bca1636fc12b87837066bdaf2530a59f2eaebfd