am 7517ffd1: am 59073b15: Merge "Fix linux 64 build" into gingerbread

Merge commit '7517ffd134d03bd5392e8292a18551bfce08ddce'

* commit '7517ffd134d03bd5392e8292a18551bfce08ddce':
  Fix linux 64 build