Merge "Add missing fsck.erofs and blkid to OTATOOLS" am: 3c454808 am: ca0a2cd4 am: 47e6b63c

Original change: https://android-review.googlesource.com/c/platform/build/+/2290117



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