Merge "Export AIDL files as a filegroup for framework.jar"