Merge "Remove overly strict slot check in JDWPMethodVariabeTableTestCase" am: ee0167ef am: 4649e837 am: 7075b9a7 Change-Id: Ia4f8e2c8c73340bcf411c3ef7c656a4efb8fffe8