Merge "Add a disabled test to verify alloc after fork." am: 945001da54

Change-Id: Ic58a59c3cd7a3885b2e4eb237e7deb180bb24191