Merge "ApiDemos: Add maxAspectRatio demo" into pi-dev
am: 246c5bb514

Change-Id: I56ab2e775c876af36c38cd4de5f6966b5518e5ba