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

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



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