Merge "Revert "Linking with system libraries is done through LOCAL_LDLIBS.""