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

Change-Id: If901bd409d8ebb855d39c3b6c74179eb377a0eeb