Cleanup: removing "ptr" suffix from var names.

Change-Id: If8e340dd6823323025a12f851e78fffdbcaaf6f8
2 files changed