Merge "Fix init rc installation in vendor when LOCAL_MODULE_PATH is set" am: 74dcb9feb3
am: 8d0fda5f9e

Change-Id: Idc39d13b21c677258d24f1e93474f65438a4532a