Fix a bunch of Eclipse complaints (unused vars, missing serial IDs) Change-Id: If31e92b4994c1058f9961dfeb17460ca4b394dfc