[automerger skipped] Merge "Use new libcore filegroup variable" am: 898caeeaed am: 458d16bced
am:ddd7d4e981-s ours am skip reason: change_id I72667f30dc5685fdc24aca3f8ee82b20c7548449 with SHA13b1b70376cis in history Change-Id: I8a6d8920ffdfe9976b157f671ff32047e171c52a
This commit is contained in: