am 2b36a86b: Wire up surface width/height to lockHardwareCanvas DO NOT MERGE

* commit '2b36a86b8ee4e8c0952494dd17b5e96ded22f2ee':
  Wire up surface width/height to lockHardwareCanvas DO NOT MERGE