Merge "Export AIDL files as a filegroup for framework.jar"
am: 62ddd26528

Change-Id: If7f0f92dd261425fa5d3bb8cd3d82201f0d05007