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

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

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