Merge "Allow EMMA_INSTRUMENT_FRAMEWORK during ninja" am: a62862bd08 am: 7ef5d07452

Change-Id: I0135eebbc8576bc314779e5639109225334dabcd