Merge "Revert "Collect ro.build.reference.fingerprint"" into lollipop-cts-dev am: 698cb2e949
am: 2e3b853882

* commit '2e3b853882bcf2ca27140af76ed6574de6503ac9':
  Revert "Collect ro.build.reference.fingerprint"