Merge "Add new test libraries"
am: 251e1578b9

Change-Id: Ib34fa242fae385fe40f8426fac1f6c5e6f9877d1