Merge "Check ANDROID_I18N_ROOT when starting the runtime" am: 4a09c691bf am: dba23bbec1
am: 7ec076c542

Change-Id: I16c52f3d974a3c9ff96fffdb1feba281b36a7873