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

Change-Id: I2e344c35fe0e9ee0b54db9ba27767e933d9ab4b9