Some of these are updates from the old build system, others are just differences/bugs being corrected. Change-Id: Ied7f47ade495dcb26ba3611e636869cba283860f