Merge "Add comments to frozen AIDL API files"