amami: Track new msm8974-common repo & clean up

Change-Id: I707bbf595b07f214e2f036b8d7f7ccd078c55419