am eb3ec64a: Merge change 5397 into donut
am eb3ec64a: Merge change 5397 into donut

Merge commit 'eb3ec64a6a962aa48a46753c6e69ce24f889a4cc'

* commit 'eb3ec64a6a962aa48a46753c6e69ce24f889a4cc':
  Fixes #1943915. Prevents circular dependency exception when using several NO_ID

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