Merge "Remove unused variable mount_point" am: b634c6f527 am: 65bbf1c194

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

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