Merge \"Rewrite LDLIBS and SHARED_LIBRARIES\"
am: a8d13592ac

Change-Id: Ic1cdfd510ff26c279a2628b58c3a1db7ef172b5c