Revert^2 "Remove references to DeviceHealthTest"

89aa3703e3e211555acd377b941a58f57e476bf0

Change-Id: I3acc449300c6ea252048e1144009cfa665c5d192
4 files changed