Merge "Support recursive static shared lib dependency" into oc-dev am: e04765998e
am: 8adfc2cac7

Change-Id: Ib07a986a02372d40ce93b9beb8e1ac74f0d3561b