Merge \"Revert \"Add missing dependency required for ahat-test.\"\"
am: 072350e6a1

Change-Id: Ia49afaa89291621f14b9d43daab83c4ed065d44d