Merge "Allow hidden api usage logging with VMRuntime" am: a666e9765b
am: aa0e503940

Change-Id: Id7a3c3870b40baab0cb1db8ac19d22d2747e521f