Merge "Link in libshaders into composer VTS"