Merge "Use -Werror in external/mksh" am: 9da7e0f318
am: b6be55d35e

Change-Id: I3bacddf544832686351f101b51042a0545a73404