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

Change-Id: Ia491fafa684890ee28b734a5c6d0efc746e37cd9