Merge "Remove redundant filegroups for last released" into rvc-dev am: b1f76fc608 am: b5f9bd4118

Change-Id: I914b0d0357d84092d79914a4d04847df41be53e8