Merge "Take hidden API into account during getDeclaredMethod()"
am: 436e1428b7

Change-Id: Icd349cd0504fc93823814631f5603db06399290f