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

Change-Id: I95f1961e1467b9167e58ff0577e1e7706a338e41