Merge "Merge \"Cleanup whole preloads directory\" into nyc-mr1-dev am: 243d7b3c" into nyc-mr1-dev-plus-aosp