issue #1683: Fixed a bug in file lookup for Android and updated JS Tests.