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

Change-Id: I1088756fe48935df229e477a52fb0b8ba2560b01