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

Change-Id: I3f9ee004ffef19b5e0f83cbb50e98a2939d2202b