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

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