Tidy up module-lib API and locks

Fixing various nits.

Test: treehugger
Change-Id: I636d1b9ef084be58ea07caa0a04ba70de18a030b
7 files changed