am c4e6233b: am b68d38e8: DO NOT MERGE change Surface constructor arg to 64bit

* commit 'c4e6233b2097dbd23927a9a247229ab67f41e4f8':
  DO NOT MERGE change Surface constructor arg to 64bit