Removed application tag from AndroidManifest.xml.
Fixed a few checkstyle complaints.
Merge with upstream.