Merge "Use -Werror in frameworks/base/tests/backup"