Merge "Fix DexmakerMockMaker to filter out Reflection calls" am: a494e0736c
am: 99fb8e677d

Change-Id: Iba81c4ba7824f4fb3af4c031f51c757eae337aca