Merge "Fix for 512 limit in assetManager.list" into gingerbread