am b2acb6b2: am b4998341: Merge "move init.trace.rc to frameworks/native"

* commit 'b2acb6b2ce07bf9e1c944eadcdc2dafe3e41efaf':
  move init.trace.rc to frameworks/native