Merge "Fix argument type for FS_IOC_GETFLAGS and FS_IOC_SETFLAGS" am: 569fb8365e am: 524e094991 am: 2fe31ededf

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1472321

Change-Id: Ica87f8b5d1a4eea3e403f5694f2557fa6891d002