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

* commit '2e32a8ad3997565358be1420afb2aedb837c8a1b':
  Actually change api to use long in CollapsingToolbarLayout.

Change-Id: Ia4b7373df97759d65089042ffb8f6dda14285255