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

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