Merge "Stop using the "stretching" file" am: b0a170136c am: 20695553e1 am: 72f359dd27

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2252876

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