Merge "init: fix to avoid loading apex *.rc files twice"
am: 3d3f24bc22

Change-Id: Ie48001976f740120621977bec5c58de6a2d827b2