update for android S

Change-Id: I02763a134f592280652d4cd7eb2eea630d01ee14
6 files changed