Merge branch 'pie-gsi' of https://android.googlesource.com/platform//system/vold into HEAD

Change-Id: I8d0adc00dbbb8e495d818776016bdc10d31ea870
Signed-off-by: Jackeagle <jackeagle102@gmail.com>