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

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



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