Adding extra infra is not acceptable for stable. Offending code has been
wrapped in a Android compile guard with an earlier commit.
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
For stable the regressions were addressed by reverting the offending
commits - see previous commit.
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>