am d996115b: am 91b01c56: Merge "Revert "Modification to the way boot classpath resources are loaded""

* commit 'd996115b9b832adc8a64d53f301e3ba64bf31c4b':
  Revert "Modification to the way boot classpath resources are loaded"