This reverts commit 30fb9b1ca4. Reason for revert: Potential culprit for CtsLibcoreTestCases test failures b/311612650 Change-Id: Ie7de97159f92a174476a8fa8ea83e3e01914aea1
30fb9b1ca4