Merge "Use "false" instead of "/system/bin/false"."
am: 7a49d93ee2

Change-Id: I3201cdb5a1826422848b1eef26b4cd6d9e24d805