Merge "Decode only the needed tables from CodeInfo." am: d61bd66a3c
am: 0fd91b6708

Change-Id: I5dc5139cca426246355c886b2a0c8a0a6c22da19