Revert "Workaround Darwin ContainedWithinExistingMap issue"

This reverts commit 29acd2f2e2d5f953535be1f71bc89cbb3a00f52c.

This workaround apparently is not needed in the master branches.

Bug: 16861075
Change-Id: I9aa3e3f8830c81a54bc5ba7fef3b9f87b81cdc4e
1 file changed