am d63d7474: am 3fd5fa4c: Fix the runtime restart due to name change.
am d63d7474: am 3fd5fa4c: Fix the runtime restart due to name change.

Merge commit 'd63d74749f068f93ead2f8c37ad3fe025dfd312f'

* commit 'd63d74749f068f93ead2f8c37ad3fe025dfd312f':
  Fix the runtime restart due to name change.

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base