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