Merge \\"elf_builder: Fix Mips header flags\\" am: 156d8ca8c1
am: 4dec26879b

Change-Id: I1c36d1390d6ce518baf8ffefd238c2eb2dc3aa69