Merge "Add handling double slash in Android assets path." into devel/master