Redo locales and include in all builds

(cherry picked from commit a98f3d446178f94e5b1aabca50d5ca3b933a9053)

Conflicts:
	target/product/languages_full.mk
	target/product/locales_full.mk
Revert "Redo locales and include in all builds"

This reverts commit b6d1907938f4b42293586104874ab53477dd07e6.
Merge remote-tracking branch 'github/cm-11.0' into HEAD

(cherry picked from commit b9cc203fa5eae51fc5aa0e471531ccef3a12ac2f)

Conflicts:
	tools/releasetools/ota_from_target_files