am 5788722d: Merge "frameworks: 64 bit compile issues"

* commit '5788722df7b73f1eff3edb95f2ead83d19603926':
  frameworks: 64 bit compile issues