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

Change-Id: Ibaad762902b51eb7fee705b2667a023cf3cea433