Merge "Do not write empty class table and intern table to image."
am: 8c0fee9ca3

Change-Id: I50675595a41193704e4387c0e069606960278ffd