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

* commit '24dbfdaa701a729e3b231db63787e0d636b7cc3b':
  frameworks: 64 bit compile issues