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

Merge "remount: Ensure that scratch images are block-size aligned." am: c20b6b58 am: bc11b2b3 am: 9dc7fc6d am: 79fd8676 am: a72f63e4

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



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