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

Change-Id: I870f7948f20077d37a4566d9fa06f09d912deac0