This reverts commit 25796416, reversing
changes made to 813d7f14.

Contrary to what we suspected the android build errors were not caused by
missing wrong relative include paths. Rather, they were caused by autoconf.
Signed-off-by: Christian Brauner <cbrauner@suse.de>