Also this patch removes unnecessary index.html references.

Change-Id: I382c1c08a3a406cabf7b519521cf8a215c7d62b4