The issue that this solves is that if vpaths is used to resolve the android needed file paths when they are referenced from other directories within the directory structure but not considered external files.
- Additional changes to get tests working