Merge "Add a tradefed config for ahat's unit tests."
am: 408bdc604e

Change-Id: Ia527d3b8754ec033de18349e4d7d25ef1dafa091