Merge "Make cexpr available to product and vendor am: 94fcfdd31c am: 62354a6a29 am: 0baa64985b am: 624b836711 am: 55a2b1a692"