Merge "Strip LOCAL_CHECK_ELF_FILES"
am: 87ec538ef1

Change-Id: I158d1818ebed209118a9703d939cc40e179d2b27