Merge changes I6942bc86,Ie67e4aa9
am: 9d05b59a85

* commit '9d05b59a8595cf7eeece1795eb65b6b8706aad45':
  ART: Fix Mac build
  ART: Log all monitor operations to systrace

Change-Id: Ida847a58a41402bf578bb5b3e65bf9b3f8dd2cbb