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

Change-Id: I96040b15d6e0b816403aebd40b7c872248874e16