Merge "msm8960: Clean up board detect code."