Code cleanup for strings files and adding Tools

Change-Id: Ice43591d1200067b6a1d9fbd5fa9981620bea452