Merge "re-organize security patchset3. add missed files" into 2.0_beta