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

Change-Id: I4c022b3a343b185c539471cf90b3dc476e7919ce