This reverts commit 5744cbdf. Reason for revert: aosp_dragon-userdebug build broken Change-Id: I5f8180273c32119ae9839f31610bbca37cd05c65