Merge "Treblize init.rc location"
am: 76e9a180a8

Change-Id: I8415b555308b8ad489413f9e99f6e73ee9caa17e