Merge "Upgrade to mksh R57." am: 66875a42ae
am: 4ddd1dd424

Change-Id: I3ae249d4ef426f835a1169722107add9f456637f