Merge "Query for static shared libs as well when needed" into oc-dev
am: 721a348839

Change-Id: I238e73b64b10dab508e3c8cb9d02e47de6a01caf