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

Change-Id: Id3740ddb449639803bd4b48f363354de76fec010