Merge "Add libraries txt file to build target" am: becbf6cb5f
am: 7e48c78a82

Change-Id: Ib683165c48b76f2811125c64a2a041cf85e3ed46