Add new builtin files

Change-Id: I00ef3c894f1cef3b5496405e6731dea84ade94db