Merge "core/init.rc: Add /data/cache/* directory creation" into nyc-mr1-dev