Merge "gn2bp: Update desc.json & Android.bp after trimming third-parties"