Merge pull request #5215 from cb1kenobi/3_2_X

Updated SDK version in the package.json.
TIMOB-16187: Don't merge attributes for module android manifest nodes.
Merge pull request #5217 from ayeung/timob-16187-3_2_X

TIMOB-16187-3_2_X: Don't merge attributes for module android manifest nodes.