Merge "Revert "Add versions property to libc_hwasan stubs""