am e9dc6ca1: merge from open-source master

Merge commit 'e9dc6ca1c0553a4cd4e4f36e376b0a533059af1f'

* commit 'e9dc6ca1c0553a4cd4e4f36e376b0a533059af1f':
  Update to latest (froyo) init.rc