am e533ad13: am ce4c7774: am 50749519: Merge "Revert "Linking with system libraries is done through LOCAL_LDLIBS.""

* commit 'e533ad13c3dae910203e87d3bb95f8f55b8af8d1':
  Revert "Linking with system libraries is done through LOCAL_LDLIBS."