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

Change-Id: Ic6a469a4e6ae1d779b879a6adf43f6da4f06aa71