Revert "fix"

This reverts commit 48c38402e0f18da4faafd4c7a064c79b32eca8b5.
reset
Merge branch 'master' of https://github.com/Allen-Hsu/jenkinsTest

Conflicts:
	proj.android/custom_rules.xml