merged upstream/android

Problems with GIT.