Merge "Add an example of an annotation-based TEST_MAPPING."
am: d5f94dfec8

Change-Id: Id74c47d9ddd62ca80d03ef1c283ae491c056fbed