am ff329d74: Merge "Rename the activity lifecycle sample\'s directory" into ics-mr1

* commit 'ff329d74fcd9d387c784d4e72c2b806c727965f6':
  Rename the activity lifecycle sample's directory