Merge "Rename incr ext4 base_fs path vars. Add to product_var_list." into nyc-dev