Merge "Support profiling of shared libs embedded in APKs." am: 4a5dafcc30
am: 615711f7ca

* commit '615711f7ca31518f72392d79d8a8aff3efb4ae34':
  Support profiling of shared libs embedded in APKs.