Merge "Fix native-lib dir assignment & updating"