Merge "Export AIDL files as a filegroup for services.jar"
am: df255dd9a7

Change-Id: Ifc4b77cde5dc2b706ca851cadc0c5822cea2eceb