Merge "packages/apps/HTMLViewer: Set LOCAL_SDK_VERSION where possible." am: 84f22d070f am: b27cd32c2c am: cc0e903abd Change-Id: Ib0cba11c4285022b8daeb4c6a09b867fbb1f5b09