Merge changes from topic "e2fsprogs_vendor_ramdisk" am: 15cd1cd8fd

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

Change-Id: Ie0a06de38161c061ab839cc49af55c16d959be61