Fix installation on resize system partition

Change-Id: If77d4b77d8c6bdd7a3bc1658407d255fb85420ac
Merge "Fix installation on resize system partition" into cm-12.0