This reverts commit 330584716d which is
commit 25de4ce5ed02994aea8bc111d133308f6fd62566 upstream.
It breaks the build and is not needed in this android branch.
Bug: 161946584
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I409b1d804cc06c189827a82b48e8a95afd9ced01