Merge "Added support for maxAspectRatio manifest attribute."