Merge "Rename ENFORCE_UID to ENFORCE_SYSTEM_OR_ROOT" am: f37dff724b
am: 3dbe996112

Change-Id: I2b4f95bd3edbbfe2c6843dc06cd9ad1a156ca532