[mer-hybris] Drop android/ header prefix

See libhybris commit 94a3871bf01ff2558aa9417badf14e45c9bbeb9e
Merge pull request #1 from thp/mer-hybris

[mer-hybris] Drop android/ header prefix