Merge "gn2bp: Ad hoc order update of local_include_dirs"