Merge "Update api/current.txt for setuid deprecation" am: 4ec239d760
am: fa99781eb0

Change-Id: Id33ba38665fc21a943ae8bd682e9917ffb329ce8