Modify the build and add necessary libraries
am: ac292f9e96

Change-Id: Ia9d46a9f3b402ab7f67555a8e1f32389fee147e9