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

Change-Id: Ic4890f5f15b093985c5342983be300a4946ffbd6