solved android manifests merge conflic

have the same number in minSdkVersion for all files and the same number
for targetSdkVersion for all files.
Merge branch 'MergeAndroidMaifest' into Felipe
Chartboost integration