Merge "Use new libcore filegroup variable" am: 898caeeaed
am: 458d16bced

Change-Id: I692b7bfbc5e7bdd8b44e26d2d55862bf725d141b