Merge "Fix script to compile emergency number database"
am: e4eb692169

Change-Id: Ie3a75acd32ef32d07d534cf321b8aaf23c962c0b