Merge "Include ldd in /system/bin." am: 485d024b05
am: 9b106fa063

Change-Id: If6662ed54788055d2402b54dc01efbb1e18b5092