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

Change-Id: I9e95cae6df6a6ed21ee88e17f5a605015449d4a4