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

Change-Id: I61e4787205818d726b93064251ca41f3a2771495