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