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

Change-Id: Ifd4960cce511b284fc11661d23f78a4476a42a47