Revert "msm8660-common: no longer need metadata hack"

This reverts commit d44d51290351f918e4678423293a5d6f6fa148d0.