Merge "Remove unused variable mount_point" am: b634c6f5 am: 65bbf1c1 am:...

Merge "Remove unused variable mount_point" am: b634c6f5 am: 65bbf1c1 am: 1ca84eea am: 583941c6 am: 32dd8683

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2504916



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