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

Change-Id: I6d18cc00937896bb227fc1ba30bc6102f84029b3