Merge \"Add missing dependency required for ahat-test.\"
am: 97c78733eb

Change-Id: I5ab4200f4ee3c93d609e52ad7ed065b1d14925ae