Make changes to testapps for API changes

Test: testapps
Bug: 30981736
Merged-In: Icbbc72e29bd6c93955f0e2a7f7efa4607482294f
Change-Id: Ifd06ba53a2f0ddc4abcda9b4c4198c424b7b3fb8
6 files changed