am f5c6a1b3: am eb573498: am 986b901a: Merge "Fix native-lib dir assignment & updating"

* commit 'f5c6a1b3eb10f0374fcbab55853f400778f0f8e7':
  Fix native-lib dir assignment & updating