Clean up some of the conditionals in the Makefile in
preparation for adding build support for MSM8960.
Signed-off-by: NStepan Moskovchenko <stepanm@codeaurora.org>
Signed-off-by: NDavid Brown <davidb@codeaurora.org>