Merge "FileSystemUtils: don't use bionic implementation details to align." into main am: 95e75635e2

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3403659

Change-Id: I0df58d2194f8566b95c17660956de9de4e385619
Signed-off-by: Automerger Merge Worker <[email protected]>