Merge "libcutils: Add "daemon" and "bin" users for testing only"
am: 718899b415

Change-Id: I7e0eb140ff8729b805c692983cc60623a1761346