Fix extra_script/extras_file conflict

Change-Id: Id2d8ed8ab5e7829786a6bb9096ba2fc4bcf08e24