Merge "Match the arm/arm64 style in the x86/x86-64 files." am: 0ceca714 am:...

Merge "Match the arm/arm64 style in the x86/x86-64 files." am: 0ceca714 am: d7e4cf41 am: 1532891d am: c95177ee am: e3bf1259

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2494342



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