Reverted some changes back to cm-10.1 code
this is recommended for Ubuntu as the android base is based on cm-10.1

Signed-off-by: David Rodero <david@codiguiel.net>

Conflicts:
	cm.dependencies
	fstab.latona

Change-Id: I873d195d8e2c9654d4c045eee61eae4d7a67a583