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

Change-Id: I955b5b5b30ba4f0cad72efe34c10c8991f082c79