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

Change-Id: Ibf15a38de8902c31fdb970d6aa2970c710480bbe