Merge "Use -Werror in system/vold/tests" am: d6d0e91c62 am: 7718457dfc am: 2412d496c8
am: 192ebf8acb

Change-Id: I1c2346c160190e26e4023e2aa4c1091ebf7621ba