Merge "Add filegroup modules referenced by cts/tests/libcore/**/Android.bp" am: 3967f3a2a6
am: 693a45197e

Change-Id: I427835d6fd15b50421b6483e3da327f47e6807cf