Merge "Use -Werror in frameworks/base/tests/backup" am: d5dca64f72 am: 6fb084db88
am: 753faba697

Change-Id: I917ea7c1627f09ed7274dc04481e36cee5c88060