Merge "apq8084: clean up baseband detection code for apq8084"