Merge changes from topic 'reflection_1_8'

* changes:
  Revert "Revert "reflection: Add new 1.8 AnnotatedElement methods and tests""
  interpreter: Fix proxy method invocation with access checks enabled.

1 files changed, 1 insertions, 1 deletions

diff --git a/runtime/mirror/class.h b/runtime/mirror/class.h
index 8fa4975532..1dae1946a8 100644
--- a/runtime/mirror/class.h
+++ b/runtime/mirror/class.h
@@ -562,7 +562,7 @@ class MANAGED Class FINAL : public Object {
   // The size of java.lang.Class.class.
   static uint32_t ClassClassSize(size_t pointer_size) {
     // The number of vtable entries in java.lang.Class.
-    uint32_t vtable_entries = Object::kVTableLength + 69;
+    uint32_t vtable_entries = Object::kVTableLength + 72;
     return ComputeClassSize(true, vtable_entries, 0, 0, 4, 1, 0, pointer_size);
   }