Merge "Stop using the "stretching" file" am: b0a17013

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



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