Remove deprecated API usage

Bug: 18213371
Change-Id: I6acaec5e8a7e5fa4ce5d7cab7040219048d4dcc6
4 files changed