Merge "Fix log typo; no using namespace std; remove unnecessary std::endls" into main am: 0a775d8aea

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2995196

Change-Id: I45ee7441ad12b8b664374bbd60a63e1b0a4d00a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>