fix no module stem for shared libraries since JellyBean
Merge remote-tracking branch 'vicamo/jellybean' into gingerbread

Reconsile from jellybean and kitkat.