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

* commit 'fa2e16e36d95d5cf0848a28a98ac4566321fc119':
  change Surface constructor arg to 64bit