montblanc: prop cleanup

Change-Id: I08d7b78babcecf7b7de6ac410fe618f9c7f65e0c
Merge pull request #1 from CyanogenMod/jellybean

montblanc: prop cleanup