This reverts commit 050e672a. The users of public getSpi have been migrated to getCurrentSpi introduced in 5d15925a. Bug: 18088752 Change-Id: I826179a468b3068cb08bfaf042001cfddbf792c2