Merge "Frameworks/base: New preload tool" am: f2c7983de1
am: f2eb8b236f

* commit 'f2eb8b236fada3e7223617689776ef44c9403cfa':
  Frameworks/base: New preload tool