Converting even more tests to TAPL

Bug: 131116002
Bug: 115582915
Change-Id: I08587e7a50420e57970ed8feec4524111145dc31
9 files changed