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

Change-Id: I39702b09925304a619c4d4f94435c965078dee8f