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

Change-Id: Ib5ff380f043b31b45b4b5ef0c9593e456b656378