Merge "Fix sepolicy-analyze libc++.so loading issue w/CTS."