Merge "Update generated AIDL interface code."