Replace new API calls w/ app compat versions

Change-Id: Ia919c67bc005360b83829fde26ae071ecd700018
1 file changed