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

Change-Id: I9ff0818cac0f65d0e456f27558595a52835e89ab