[Fix #608] Support old android prefixes
Merge pull request #609 from k88hudson/608

[Fix #608] Support old android prefixes