am 0cba972c: am d141a903: Merge "Move preloaded-classes out of framework.jar."

* commit '0cba972c4038b3c9d88fcf30f31e7005b69c9df8':
  Move preloaded-classes out of framework.jar.