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

* commit '54190ec8307ebb83d02b7d9b8edc80a042792de6':
  change Surface constructor arg to 64bit