Merge "Upgrade to mksh R40." am: ceb0b57de2
am: caf111e450

Change-Id: I1c004b01a61d85022defd2c461a12c5db8778307