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

Change-Id: If1ea4f9aa9645f745144ec569b8f124b03700469