android-5.0.0_r6 -> android-5.0.0_r7

Change-Id: I1277d9a20101bed3200fafee530c8662291455f8

Conflicts:
	default.xml