am 9a4d70f8: am 5735b1b5: Merge "Fail fast on persistent failure" into jb-mr1-dev
am 9a4d70f8: am 5735b1b5: Merge "Fail fast on persistent failure" into jb-mr1-dev

* commit '9a4d70f84d7ed3c4555ef4e568b7633e6854e678':
  Fail fast on persistent failure

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