Merge "Export aidl files for framework"