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

Change-Id: Ibef454ccaa00455f1bbcc56ef16c83063fa3fd10