Merge "remount: Ensure that scratch images are block-size aligned." am: c20b6b58

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



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