Merge "Make num_cpus available to product and vendor am: fd7e77a0a9 am: 79f4eeca1e am: d3fe38d433 am: 4c84410f0f am: f2b8688cdd"