Merge "Use -Werror in system/extras/tests" am: 0bc040a8cb am: 652738ae52 am: f117e43806
am: 86d57454e7

Change-Id: I4978439e228bf87351704558518da98752f210b1