Cleanup Android manifest and remove some warnings from latest SDK.