Merge "Export aidl files for framework"
am: f5e37d18de

Change-Id: If2e9391da213b064e1b55fa0da56e78ac144c89b