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

Android 7.1.0 release 4