v6036

Change-Id: I7e70d0e2e367f703fe420d4300eb5fecdc247099

Conflicts:
	Android.mk