Add a couple of libs

Change-Id: I49144f58021b4b69bc5ce3a46b84da6b53d8b39c