Revert "Revert "Revert "Use our system/core to avoid errors in build"""

This reverts commit 7bebf23c8c00be839c5030123b5c85f4f6f1097d.
Revert "Revert "Revert "Revert "Revert "Use our vold"""""

This reverts commit 454f1b9112a5c42f33148efac8b594d5cab67354.