Merge pull request #3432 from koying/adddroidarchcheck