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

* commit '03745a04ccb67a213083a720e6bdbdedfcae673d':

Change-Id: I3bd5a17568160fa15af856c49ef83e2ef5a01b0c