CHROMIUM: Merge tag 'v6.1.179' into chromeos-6.1
Conflicts:
fs/proc/base.c
Incoming commit 31509970efd3 conflicts due to
downstream commit e00590e0e6e4 and 0eb5df0d8284.
Apply the incoming and keep the downstream changes.
BUG=b:542900253
TEST=cq
Change-Id: I65fcc1d67461795648480b2423ae6ffe13ad29b8
Disallow-Recycled-Builds: test-failures
Signed-off-by: Tzung-Bi Shih <tzungbi@chromium.org>