Merge "Split parcelable .aidl files to aidl-export" into sc-dev