Merge "Add require_root for libcutils tests" am: 71ed80a229 am: 03c0a3ab1b
am: c4bbbbc8c0

Change-Id: I10839c79e99e28c8aef5e1f41beb67f6ce1333c3