Merge \"Add a flag to enable instrumentation of the framework classes.\" into nyc-dev
am: 15783f0073

Change-Id: Ie9e71eb96ad654fc1d34317177cce8013bc2dcb9