am a4e345e1: Merge "sensorservice: 64-bit compile issues"

* commit 'a4e345e169fd9101011e358abdfb9308bc065bdb':
  sensorservice: 64-bit compile issues