Still some issues with 136-daemon-jni-shutdown bug:28406866 This reverts commit 9e726e87. Change-Id: I76e7ba47e30cf97ecd074d5c2aff41cda8edac59