Merge "Ensure CTB size > 16 for clips with tiles and width/height >= 4096" into lmp-dev am: db15dd7102 am: 419fd4b745
am: 8e6cf47bf1

Change-Id: I893a9a91df23625bf2cbd6ce2d226b682c773130