Merge changes I714163b4,I368d5ce2

* changes:
  vndk-def: Ignore ELF files with unknown machine ID
  vndk-def: Fix test_elfdump.py