Merge "Use -Werror in frameworks/base/tests/backup"
am: d5dca64f72

Change-Id: Ic05b86f4bbff44e03298e823e9105c664b7ba1e0