This reverts commit 235e2fdb. Reason for revert: <build break> Bug: 161315642 Change-Id: Ie741252dc1d0749591f141c71c3d59ce45f0234f