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

Change-Id: I27e3ceaeb2a093107ce999e85979cbb9693372e5