Revert "Start using new list of non-SDK APIs"

This reverts commit 1eb330c14a612277ae12662c3f36b8ab20655aa3.

Reason for revert: build failure in git_master/apps

Change-Id: Ia76a38dc2223f4c969bf4ec5f95ca2e0e214d1e9
3 files changed