Update a few more uses of deprecated methods

Test: make
Bug: 37863673
Change-Id: I24a38bfaa11c6a9d75d264ab9861dc2e5ee57b2e
(cherry picked from commit 580d1b50021e74f783adeaed660ad7b7d2e2a0ed)
1 file changed