Merge "Set Uml if TARGET_USER_MODE_LINUX is true"
am: 714f406a8a

Change-Id: I93690f777b3bc988731d6f7d26eea0d73462c562