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

Change-Id: Ib52a55c5ae1400359d544aeb07bf5d48fb4ab8fb