Merge "Switch make over to use the new prebuilt modules."
am: 2944c11b1f

Change-Id: Ia2035f6c06ade38e39ce46b00ef3c7c415403a46