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

Change-Id: Ic9f18b013f5bd332c9b1061450b1b3932ff229c4