Consolidate API naming to use Parser everywhere

Bug: 132153067
Test: CTS.
Change-Id: Ie274518683ffabff207dd845f3107e3313a5dfd7
2 files changed