fix android manifest - better package for main activity
Adjust template for support library
nn