Merge "Export AIDL files as a filegroup for framework.jar" am: ec92cd91f7  -s ours
am: 20eb8c9f34  -s ours

Change-Id: Ie2d22cc754eee838e2ea5f3874937abc0276160a