Merge "Add the StorageManager APK to the core build." into nyc-mr1-dev