am 3d2ecafd: am ec5acee1: Merge "workaround to unbreak the build (deadlock...
am 3d2ecafd: am ec5acee1: Merge "workaround to unbreak the build (deadlock during boot)" into jb-mr1-dev
* commit '3d2ecafd':
workaround to unbreak the build (deadlock during boot)