Merge "Import surfaceflinger tests into renderengine's TEST_MAPPING" into tm-dev