Merge "Mark unused parameters as UNUSED in BRILLO."
am: 1567662f5a

Change-Id: I41ac014fdbba3b13c41b46f2309a75d19f1b9174