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

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

Change-Id: I9985bec7dd25b372563992961cb09d08b03fc610