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

Change-Id: Ic1a6a4a38bb031d1cafe2a464a7376761905f785