Merge "Annotate vfork for hwasan." am: 8b8e7d0461
am: 48c5b26a9a

Change-Id: I33ecc9066c4f221e0e39d23479151fae39e356af