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

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



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