Merge "Restore some of the mksh builtins." am: cd79a34d28
am: b48d5773d8

Change-Id: I8c6a2f2b317fda8699b33990eb33af61d8e48211