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

Change-Id: If584daaf9b59531ebc9854003164ef6d7834c931