Merge remote-tracking branch 'upstream/master' into bbb

Conflicts:
	elftools/elf/dynamic.py

Resolved by using upstream's verbatim copy because vapier's change is
now in upstream.

Change-Id: I6c597d4ef0a876d26736f96360cff95c072e8005
diff --git a/README.chromium b/README.chromium
new file mode 100644
index 0000000..29489fa
--- /dev/null
+++ b/README.chromium
@@ -0,0 +1,11 @@
+Name: pyelftools
+Short Name: pyelftools
+URL: https://bitbucket.org/eliben/pyelftools
+Version: 0
+Revision: d23cf2f5bd2a3c3d6f516f0f2d01817ea83236fc
+License: Public Domain
+License File: LICENSE
+Security Critical: no
+
+Description:
+This contains Chromium OS's patched version of Eli Bendersky's pyelftools.