Target SDK 23

Bug:23642167
Change-Id: I44fed5d32a0bf542758a9f51fb516ab233f7abf4
(cherry picked from commit cb226451cf43bf8a00c4498b81d9220bac62c865)
1 file changed