Merge "Add device-tests and general-tests make targets."
am: c436f9eeec

Change-Id: Ic238377df600af06397d31bd4f5661e9a7e5316e