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

Change-Id: I56f68e669decd099290e38850445809cbe1b7e07