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

Change-Id: I40cb1b2de1259438b5ede891c840346d2e7cd6c2