am 363bdce9: am 4b030f0b: am 720d677f: am aae9c930: (-s ours) am 2f50403f: am afedbc47: Make Context.getClassLoader() work. [DO NOT MERGE]

* commit '363bdce919fe9a0389c7a59fa44dd7947160b930':
  Make Context.getClassLoader() work. [DO NOT MERGE]