Merge "Fix locking of libnativeloader"
am: 17741bc85c

* commit '17741bc85c0570a4f01bf8c945db1cd1b117a19a':
  Fix locking of libnativeloader