Merge "Surface: Use async lock/unlock in copyBlt" am: b73de86f13 am: e29dda829d
am: 55f599a079

Change-Id: I1f7603e0808a3794d708e788818d83814c10dcb3