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

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