Merge "packages/apps/HTMLViewer: Set LOCAL_SDK_VERSION where possible." am: 84f22d070f
am: b27cd32c2c

Change-Id: I6d75dfb7931a274c809931d39dd571726da87bc5