Revert "Sort out BOOTCLASSPATH"

This reverts commit 3080bff26e686f6d1d3aa6d72e5584d8d5d3e92e.

Change-Id: I37a73c47a8b0767252a466d1136faa1c1e2182bc
Merge "Revert "Sort out BOOTCLASSPATH"" into jb-mr2