pull from master, and swap vendor_slim to slimX

Change-Id: Ib4a896eebcfb6e67859b64704495da79dddf824c