Revert "back to AOSP main  revision"

This reverts commit 7b48e58f17d0b25df7a2b89966aca6316db3a03a.

Conflicts:
	default.xml