Fix build errors after merge and add missing file

Change-Id: Idd59799a242bfe5c82c6a80f7925851e89807ce9