Merge "Re-enable tests disabled because of libnativehelper_compat_libc++."