Merge "surfaceflinger: fix initial crop computation" into oc-dr1-dev
am: 349abaf55f

Change-Id: I59142a2d51c8a8f6fdd425a5b787e0d1d4cb606a