am 2ac81ee6: (-s ours) am c4e6233b: am b68d38e8: DO NOT MERGE change Surface constructor arg to 64bit

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