msm8974: Part 2 of "I am an idiot"

 * Derp on the proprietary side caused these files to briefly not
   be included for certain individuals. Restore the upgraded version.

This reverts commit 9ac522bdf58abc7d1917a29b093d4e5bfb35db01.

Change-Id: Ib1300dbc65127c436a23eedc5034a5ae008e7121
Cleanup
Merge remote-tracking branch 'cm/cm-11.0' into kk-mr2