am 0a5f518e: am bf417b4d: Merge "Frameworks/base: Update to preloaded-classes" into lmp-dev

* commit '0a5f518e0ebb251f441e4f54b48e580a04006665':
  Frameworks/base: Update to preloaded-classes