Merge "Fix `adb logcat` return code."
am: 5587aba58d

Change-Id: I7b79c9d5d938a3104613cf063658af3ad8f9858c