fix heap screenshots and old hwcomposer api

Conflicts:
	services/surfaceflinger/DisplayHardware/HWComposer.cpp