Updated build scripts

(cherry picked from commit 7e086075bca4c920fa8ce6231e960c9c72b0ae84)
Updated AndroidManifest.xml

(cherry picked from commit 5b577833ce3d9fd7ef683304f4c67be9223a5ebf)