tree 27bfec6d4d40f97c4717772b73a6ad12c329a6cf
parent 35f227d4afc7a8cf863196c8829688b9cf081f05
parent ac292f9e96398f6c2233f34372d57f1e938a2ca5
author Paul Duffin <paulduffin@google.com> 1489748677 +0000
committer android-build-merger <android-build-merger@google.com> 1489748677 +0000

Modify the build and add necessary libraries
am: ac292f9e96

Change-Id: Ia9d46a9f3b402ab7f67555a8e1f32389fee147e9