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: I646cfde96688cc6420bdd1b8b1876cd80ba318b2