Merge "System/root/shell need to explicitly ask for static libs to get them" into oc-dev am: c3db339987
am: e87dc7bb2c

Change-Id: I444ced398404698c88e1353ee47cd648c9ad9c9f