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

Change-Id: I49dad18755bc780749d60e2be18d02e4305a9e15