Add per file Apache license

also optimize imports

Change-Id: Ic596a609de99d4604fda899f8bdef2d527ad1a77