Android p preview 4
Merge "packages/apps/HTMLViewer: Set LOCAL_SDK_VERSION where possible."