Merge "Fix bug 3163150 - move holo extended themes to an overlay file."