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

Change-Id: I41b89ecbe8b910eb0dd3e9b51aa827e9cdcff88f