Merge \\"Filter logging from dexdump/dex2oat to errors only\\" am: be6b4fc1b3
am: 5efb73504d

Change-Id: I3a39624a5ce329f67c30ce71b00f685abd14f569