Merge "Allow EMMA_INSTRUMENT_FRAMEWORK during ninja"
am: a62862bd08

Change-Id: I324c0019f900b502f3d557f6c215bab010eda7f6