Merge "Revert "Collect ro.build.reference.fingerprint"" into lollipop-cts-dev am: ccbb14667a am: 8cb1f6f745
am: 028d6cb1c9

* commit '028d6cb1c9263950b6689b2edb0e10ded6d3a291':
  Revert "Collect ro.build.reference.fingerprint"