am da17dee0: resolved conflicts for merge of 35ad5f41 to eclair-plus-aosp

Merge commit 'da17dee0332375abfc1da6d74de851f906c0357b'

* commit 'da17dee0332375abfc1da6d74de851f906c0357b':
  rootdir: init.rc: *LATENCY EXPERIMENT* - Disable cgroups in favor of new scheduler policy support