The JavaScript in the assets/ dir wasn't inherited from UnifiedEmail, and UnifiedEmail's ProGuard flags were being ignored. Also refactor a bit of the makefile. Change-Id: Ic3de41f3eb1882831d61b8ae34e4dd298660acdb
Change-Id: I41de9a5307d56f358bc523bb139cdf90a0786dae