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

Change-Id: I6e606ee28398fbedfebf4e6e1403d784cf127831