Merge Shooter & msm8660-common

First test, will currently build. Once everything checks out as working as before the merge will need to clean up a bit.