Merge "Fix partition configuration for tv builds." into master-cuttlefish-testing
am: eb95c0b0ba

Change-Id: I31d9b467c95ee026e7e9d461de0dba47a91f2911