Clean up test_api_samples a bit

Remove all unnecessary return statements in our tests

Change-Id: Ic01a211e48781241cac3fdef75760a3a6dafadc6
Update mailmap

Update mailmap to reflect new email address that I will be committing
under

Change-Id: I9f8610ad982ed678c0b367b3a1768578739b2543
Merge "Update mailmap"
Merge "Clean up test_api_samples a bit"