Merge tag 'android-7.1.0_r4' of https://android.googlesource.com/platform/system/vold into aosp-7.1

Android 7.1.0 release 4
12 files changed