Merge changes I5ac2ac90,I5df10575 into jb_2.5

* changes:
  mmc: support BKOPS feature for eMMC
  mmc: Revert BKOPs feature