am 4d2593d3: Merge "Make StorageMeasurement multiprofile aware." into mnc-dev

* commit '4d2593d3f2ce052de5000ebec28bc99a12dd5497':
  Make StorageMeasurement multiprofile aware.
tree: c40301c5a88b3fbe83b645265d8e70a4655203b3
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. wrap_alpha.py