Merge "Relax check on number of segments in a .so file" am: 3bc5e74c54
am: 82d6d48254

Change-Id: If6643bd0708eaa3b410f9c81e25d484db2e7b7fa