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

Change-Id: Id2ac1f22767fa6f30c441501744cd3b18c9b294f