Merge "src_frameworkcommon: Fix filegroup base path" am: a9e12249f4 am: 6cae17b0a9

Change-Id: I6ea8e3a483a5be7567dc841a2c99ee4bf663f05d