Merge "Make nix available to product and vendor am: 3e85770325 am: dca9aae545 am: 25b21a099e am: ecbc9ecccf am: f120190ec6"