Merge "Use filegroups for the droidstub txt files"