fix unittest
prepare next android version
Merge commit '49225277974a96740d3c45d30a01e24b9c62e68b' into ios7Dev