get rid of QUERYINT macro in sd

Change-Id: I058cf5bdd3d11fb28b3e497c1a13e4ffc7e4ed84
android: remove unneeded code paths

Change-Id: I5da4ca67caf2bc2e368c74cf719b080c63b6d47f