Merge "Remove unused empty filegroups from frameworks/base."