issue #1683: Fixed a bug in file lookup for Android.
Updated JS Tests.
Merge pull request #1900 from dumganhar/master

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