Merge "DO NOT MERGE increase generic_mips system partition" into lmp-dev
am: 198262ff83  -s ours

Change-Id: I0a336fa847df3c1375e1263e50723f08635d531f