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

Change-Id: I01efffcde5175762694a446979faed66447309bb