Blocked cached Google Music files from nandroid

Patchset 1) initial patch

Change-Id: I76719bdd90be716f1beaeac293c5158eddf3a240
6.0.2.9

Change-Id: Ib39519bb312c234b1092c067957c50d6c522ba49
Merge branch 'vendor-cm-cm-10.1' into cm-10.1-v6.0

Conflicts:
	Android.mk