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

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

Change-Id: Ieaf8c96378dfdf20ce21648c0fb6ae9e39ce4260