update build, sync parts with cyanogenmod

Change-Id: Ife632bb924b98512707d44844f7709ab43853700