nonblocking DiskBasedCache

https://android-review.googlesource.com/#/c/63630
Merge branch 'feature/nonblockingDiskBasedCache' into develop
Merge branch 'release/2014-01-28_2'