Expect plugin theme directories to have a "templates" subdirectory

Bug 1328319. Still keeping the old location in the search path as well,
for backwards-compatibility.

Change-Id: Iee2c908bad933a3942f103df6f827ace3beee259
Merge "Expect plugin theme directories to have a "templates" subdirectory"