Merge "elfcheck: Add Android.mk auto-fix rewriter"
am: 42abf9e61b

Change-Id: I04b63205c33ba10fc7ae071afd984ac3d9d29599