Merge "Add more HWC vs RenderEngine tests to composer vts"