Merge "init.rc: add a new maps dir under /metadata/aconfig dir" into main