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

Change-Id: I362e39c677ac0218b06fcf1a6ce6faec91612bda