[TIMOB-17633]: Update java sections properly
Merge pull request #6023 from hieupham007/timob-17633

[TIMOB-17633]: Update java sections properly
Revert "[TIMOB-10837] use return with the last statement for blocks"
Merge pull request #6026 from appcelerator/revert-5210-TIMOB-10837

Revert "[TIMOB-10837] use return with the last statement for blocks"