Merge "Refactor to prepare for incremental native lib extraction"