Merge "Clang-format android_keymaster_messages.cpp"