Manually merge commit '61e74d7' into stage-aosp-master

* commit '61e74d7':
  libsparse: add a function to retrieve the data blocks

BUG:33304034wq