Merge "isBlockAligned to use uint64_t" into main am: be85b80f23 am: 4dcb108e2f

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

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