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

Change-Id: Ie5178680bfee7a48257f365416f802e2b1566e32