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

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



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