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

Bug: 218976943
Test: adb remount
Change-Id: I46a4592c4ba504865a633437d734ce26e5fba6a5
(cherry picked from commit 2d8bc218237bd2759f88840e16ad2f87ed393146)
1 file changed