Merge "Merge "HWUI: do not call glCopyTexSubImage2D on empty area." into nyc-dev am: e4e240f13f am: f1eb9c63ee" into nyc-mr1-dev-plus-aosp