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

Change-Id: Iaf06eb6ac07bbab02003be6e1f09656adbdda059