[maguro][fixup-mountpoints] Fix mount points for maguro

Change-Id: I537e4df9b253ff8e9b13da3fc96cbda23f2c5858
[maguro][fixup-mountpoints] Add factory partition

Change-Id: I741ab06a4e9feba1bb505717af0fed74571ae5df
Merge remote-tracking branch 'beidl/hybris-10.1' into HEAD

Conflicts:
	fixup-mountpoints

Change-Id: Ibcbcc78cec128c4419ddc527ddbda5d6a733c8cc