Commits
John Reck authored and Chris Craik committed 2b36a86b8ee
Wire up surface width/height to lockHardwareCanvas DO NOT MERGE Bug: 18338026 Change-Id: I6c37774ef1312278ae81280561060662fef923fb (cherry picked from commit b35c9602cf5c628c621e4fe102a461505f302bfe)