Merge "Fix data type error in AIDL"