Revert "Change testapps to reflect API fixes"

This reverts commit 6441576f0d26b9c15759e50a9685385d4133818e.

Change-Id: I389dbeb83b013172ab8a552daacb5695ad8d9871
4 files changed