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

Change-Id: I1aa4186eb6aa05f08646cc750e30d9a9647f8abe