Merge "Use -Werror in frameworks/native/cmds" am: afee092bee
am: f037948524

Change-Id: Idf7b0b8b128d6deada63a4fcf10d00f7034dcf41