Merge "Avoid inspecting packages twice to deduce ABIs for moves / installs." into mnc-dev