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

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

Change-Id: I7d9b20e25b93c0f9707714027ab6c15fa9d224f7