Merge "vold: use system-clang-format" am: 7e65d8dd00
am: c302876a95

Change-Id: Id9e2301657352c7d8f06bea899574f01d316a1c9