Merge "Export aidl files for framework" am: f5e37d18de am: 28064dd526
am: 79aee072bb

Change-Id: I1491878b8d009c0fe8e688c2397ea9380ff0335c