Specify source file encoding as UTF-8

Change-Id: I11be1b537808b9f36fb4533933d69c8a80ee1066
Remove extra ","

Fix invalid json - remove extra ",".

Change-Id: I8dde065bcb8be96e467f058d7738d5b1f68d6383
Closes-Bug: #1255124
Merge "Specify source file encoding as UTF-8"