Merge "Add TestablesTests to device-tests for APCT suite" into pi-dev am: d9bd20b0dc
am: 7f4cea8520

Change-Id: I860bd3b9402b4b9b446451a926f5a39a84e6da46