am 133c9649: am fa2e16e3: am 54190ec8: Merge "change Surface constructor arg to 64bit"

* commit '133c9649c3c83e6ccefa4f46c162ddb3f55269d0':
  change Surface constructor arg to 64bit