This reverts commit 726f115660
.
Reason for revert: broke git_master
https://android-build.googleplex.com/builds/submitted/4635329/sailfish-userdebug_fastbuild3_linux/latest/view/logs/build_error.log
Change-Id: Icefa78f0a79f7ff0af373f3f0cd35d200cd4fec8