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

* commit '4a5dafcc3093d55fc9d135b9a18c73bd96bcf3b1':
  Support profiling of shared libs embedded in APKs.