Merge "Rename ProcResult stdout and stderr fields" into stage-aosp-master