Merge "Fix the BUILD.gn to conform with recent changes in platform2"