1003

Change-Id: Ie9e353d9c39e6190f8aeb89c24c6966d541c9ca1
fix ndk to go to assets?

Change-Id: I95b5a7e685558d5f42317724129272330f44a8ed
1005

Change-Id: I02b67401b0edf7c43c3b0d5b9b44d3bc9bd8cea1
Merge branch 'master' of git://github.com/koush/Superuser