Fix ota build and problems with extra_files

Change-Id: I4dccdb317d2ed1d134ccdfae4e0e9bf436c3d531