Revert "core: align BOOTCLASSPATH"

This reverts commit 70671b4c3a17a6b1aebf7075c90cd995987f467d.

Change-Id: I591eb2770f36e5605f74550c05eb1c0c118fc23e