Merge "Bump API level required for const-method-{handle,type}" am: a5da5b9d92 am: e8092c184f
am: a2fd7fd1e7

Change-Id: I8ae45937c218bfc2c093554ded09c4a99da019af