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

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

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