Merge "Fix ELF header parser bug." into jb-mr1.1-dev