Merge "Test ld-android.so directly"