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