Merge \\\"Rewrite LDLIBS and SHARED_LIBRARIES\\\" am: a8d13592ac am: d8210177af
am: 74da7c9272

Change-Id: I46c8960c00858ada3968f138999e0d24e6814217