Merge "Add a common test library." am: 9690384221
am: 4343cf32aa

Change-Id: I6104a1a677cb2e4978f11be32dfc604ee431d009