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

* commit '936e87e12dd1335c6f773705fd0a7edb32bc4385':
  frameworks: 64 bit compile issues