Merge "Convert gralloc.default to soong" into main