Merge "Tidy up module-lib API and locks"
am: 98ab83c37d

Change-Id: I0c136617cef0d23e905757a0b6baf2b7e823212d