Merge changes Iae143d11,I400c347b,I0639df17,I6d56160d

* changes:
  graphics: add a basic test for IMapper::lockFlex
  graphics: clean up composer VTS tests
  graphics: clean up mapper VTS tests
  graphics: clean up allocator VTS tests