Fix make file by adding google analytics back
Update uses of deprecated APIs

Merging kwd commit 5449d5584302ecb8ec5c30a86c94a429cca9a2db
Change-Id: Ibfb7f467dd1c234c0b14655c53f464f45c8e22a7
4 files changed