Merge "rootdir: init.rc: mount tracefs" am: a5fa1ae859 am: 8535d19357

Change-Id: I2770f5ef2a48f0430519c626d7d24464f93e30de