Merge "No using inside header files" am: 17e1a0919d am: 23aaf5a7a6

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

Change-Id: I9299b2f0762c02dae28b4dad8a6ee67fd03ad1a1