Merge "Bug fix: null string will cause exception in checkStringInAdbCommandOutput"