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

Change-Id: I74f21fe6a41d2585a05c6e0c47e80b9041bae588