am 62f03479: Merge "Use new flag for emma instrumented build and limit to apps...
am 62f03479: Merge "Use new flag for emma instrumented build and limit to apps only" into jb-mr1-dev
* commit '62f03479':
Use new flag for emma instrumented build and limit to apps only