Merge "Check LocalInfo descriptor for nullptr in dexlayout." am: 30b262c298
am: d185e7810f

Change-Id: I6d899f8b74c8180982e8e2c312eca67eb881ccb5