From f01a570229a7b2c77acceb203ba4f3c16a84aa4a Mon Sep 17 00:00:00 2001 From: Thomas Guillem Date: Wed, 19 Nov 2014 13:11:52 +0100 Subject: [PATCH] move android-headers/android-headers- to android-headers/ --- .../include/android_runtime/ActivityManager.h | 0 .../include/android_runtime/AndroidRuntime.h | 0 .../android_app_NativeActivity.h | 0 .../android_content_res_Configuration.h | 0 .../android_util_AssetManager.h | 0 .../android_runtime/android_view_Surface.h | 0 .../frameworks/base/include/binder/Binder.h | 0 .../base/include/binder/BinderService.h | 0 .../frameworks/base/include/binder/BpBinder.h | 0 .../frameworks/base/include/binder/IBinder.h | 0 .../base/include/binder/IInterface.h | 0 .../frameworks/base/include/binder/IMemory.h | 0 .../base/include/binder/IPCThreadState.h | 0 .../include/binder/IPermissionController.h | 0 .../base/include/binder/IServiceManager.h | 0 .../base/include/binder/MemoryBase.h | 0 .../base/include/binder/MemoryDealer.h | 0 .../base/include/binder/MemoryHeapBase.h | 0 .../base/include/binder/MemoryHeapPmem.h | 0 .../frameworks/base/include/binder/Parcel.h | 0 .../base/include/binder/Permission.h | 0 .../base/include/binder/ProcessState.h | 0 .../frameworks/base/include/camera/Camera.h | 0 .../include/camera/CameraHardwareInterface.h | 0 .../base/include/camera/CameraParameters.h | 0 .../frameworks/base/include/camera/ICamera.h | 0 .../base/include/camera/ICameraClient.h | 0 .../base/include/camera/ICameraService.h | 0 .../base/include/gui/ISensorEventConnection.h | 0 .../base/include/gui/ISensorServer.h | 0 .../frameworks/base/include/gui/Sensor.h | 0 .../base/include/gui/SensorChannel.h | 0 .../base/include/gui/SensorEventQueue.h | 0 .../base/include/gui/SensorManager.h | 0 .../base/include/media/AudioEffect.h | 0 .../base/include/media/AudioRecord.h | 0 .../base/include/media/AudioSystem.h | 0 .../base/include/media/AudioTrack.h | 0 .../frameworks/base/include/media/EffectApi.h | 0 .../base/include/media/EffectBassBoostApi.h | 0 .../media/EffectEnvironmentalReverbApi.h | 0 .../base/include/media/EffectEqualizerApi.h | 0 .../include/media/EffectPresetReverbApi.h | 0 .../base/include/media/EffectVirtualizerApi.h | 0 .../base/include/media/EffectVisualizerApi.h | 0 .../base/include/media/EffectsFactoryApi.h | 0 .../base/include/media/IAudioFlinger.h | 0 .../base/include/media/IAudioFlingerClient.h | 0 .../base/include/media/IAudioPolicyService.h | 0 .../base/include/media/IAudioRecord.h | 0 .../base/include/media/IAudioTrack.h | 0 .../frameworks/base/include/media/IEffect.h | 0 .../base/include/media/IEffectClient.h | 0 .../base/include/media/IMediaDeathNotifier.h | 0 .../include/media/IMediaMetadataRetriever.h | 0 .../base/include/media/IMediaPlayer.h | 0 .../base/include/media/IMediaPlayerClient.h | 0 .../base/include/media/IMediaPlayerService.h | 0 .../base/include/media/IMediaRecorder.h | 0 .../base/include/media/IMediaRecorderClient.h | 0 .../frameworks/base/include/media/IOMX.h | 0 .../frameworks/base/include/media/JetPlayer.h | 0 .../media/MediaMetadataRetrieverInterface.h | 0 .../base/include/media/MediaPlayerInterface.h | 0 .../base/include/media/MediaProfiles.h | 0 .../base/include/media/MediaRecorderBase.h | 0 .../frameworks/base/include/media/Metadata.h | 0 .../base/include/media/OverlayRenderer.h | 0 .../base/include/media/PVMediaRecorder.h | 0 .../base/include/media/PVMetadataRetriever.h | 0 .../frameworks/base/include/media/PVPlayer.h | 0 .../base/include/media/ToneGenerator.h | 0 .../base/include/media/Visualizer.h | 0 .../include/media/mediametadataretriever.h | 0 .../base/include/media/mediaplayer.h | 0 .../base/include/media/mediarecorder.h | 0 .../base/include/media/mediascanner.h | 0 .../include/media/stagefright/AMRWriter.h | 0 .../include/media/stagefright/AudioPlayer.h | 0 .../include/media/stagefright/AudioSource.h | 0 .../include/media/stagefright/CameraSource.h | 0 .../media/stagefright/ColorConverter.h | 0 .../include/media/stagefright/DataSource.h | 0 .../include/media/stagefright/FileSource.h | 0 .../include/media/stagefright/HardwareAPI.h | 0 .../include/media/stagefright/JPEGSource.h | 0 .../include/media/stagefright/MPEG2TSWriter.h | 0 .../include/media/stagefright/MPEG4Writer.h | 0 .../include/media/stagefright/MediaBuffer.h | 0 .../media/stagefright/MediaBufferGroup.h | 0 .../include/media/stagefright/MediaDebug.h | 0 .../include/media/stagefright/MediaDefs.h | 0 .../include/media/stagefright/MediaErrors.h | 0 .../media/stagefright/MediaExtractor.h | 0 .../include/media/stagefright/MediaSource.h | 0 .../include/media/stagefright/MediaWriter.h | 0 .../base/include/media/stagefright/MetaData.h | 0 .../include/media/stagefright/OMXClient.h | 0 .../base/include/media/stagefright/OMXCodec.h | 0 .../include/media/stagefright/OMXPluginBase.h | 0 .../media/stagefright/ShoutcastSource.h | 0 .../stagefright/StagefrightMediaScanner.h | 0 .../include/media/stagefright/TimeSource.h | 0 .../base/include/media/stagefright/Utils.h | 0 .../include/media/stagefright/VideoRenderer.h | 0 .../media/stagefright/foundation/AAtomizer.h | 0 .../media/stagefright/foundation/ABase.h | 0 .../media/stagefright/foundation/ABitReader.h | 0 .../media/stagefright/foundation/ABuffer.h | 0 .../media/stagefright/foundation/ADebug.h | 0 .../media/stagefright/foundation/AHandler.h | 0 .../foundation/AHandlerReflector.h | 0 .../media/stagefright/foundation/ALooper.h | 0 .../stagefright/foundation/ALooperRoster.h | 0 .../media/stagefright/foundation/AMessage.h | 0 .../media/stagefright/foundation/AString.h | 0 .../media/stagefright/foundation/base64.h | 0 .../media/stagefright/foundation/hexdump.h | 0 .../media/stagefright/openmax/OMX_Audio.h | 0 .../media/stagefright/openmax/OMX_Component.h | 0 .../stagefright/openmax/OMX_ContentPipe.h | 0 .../media/stagefright/openmax/OMX_Core.h | 0 .../media/stagefright/openmax/OMX_IVCommon.h | 0 .../media/stagefright/openmax/OMX_Image.h | 0 .../media/stagefright/openmax/OMX_Index.h | 0 .../media/stagefright/openmax/OMX_Other.h | 0 .../media/stagefright/openmax/OMX_Types.h | 0 .../media/stagefright/openmax/OMX_Video.h | 0 .../base/include/media/thread_init.h | 0 .../base/include/pim/EventRecurrence.h | 0 .../frameworks/base/include/private/README | 0 .../base/include/private/binder/Static.h | 0 .../include/private/binder/binder_module.h | 0 .../include/private/media/AudioEffectShared.h | 0 .../include/private/media/AudioTrackShared.h | 0 .../base/include/private/media/VideoFrame.h | 0 .../include/private/opengles/gl_context.h | 0 .../private/surfaceflinger/LayerState.h | 0 .../surfaceflinger/SharedBufferStack.h | 0 .../base/include/private/ui/RegionHelper.h | 0 .../include/private/ui/android_natives_priv.h | 0 .../include/private/ui/sw_gralloc_handle.h | 0 .../base/include/private/utils/Static.h | 0 .../base/include/storage/IMountService.h | 0 .../include/storage/IMountServiceListener.h | 0 .../include/storage/IMountShutdownObserver.h | 0 .../base/include/storage/IObbActionListener.h | 0 .../base/include/surfaceflinger/ISurface.h | 0 .../include/surfaceflinger/ISurfaceComposer.h | 0 .../surfaceflinger/ISurfaceComposerClient.h | 0 .../base/include/surfaceflinger/Surface.h | 0 .../surfaceflinger/SurfaceComposerClient.h | 0 .../frameworks/base/include/tts/TtsEngine.h | 0 .../frameworks/base/include/ui/DisplayInfo.h | 0 .../base/include/ui/EGLNativeSurface.h | 0 .../frameworks/base/include/ui/EGLUtils.h | 0 .../frameworks/base/include/ui/EventHub.h | 0 .../base/include/ui/FramebufferNativeWindow.h | 0 .../base/include/ui/GraphicBuffer.h | 0 .../base/include/ui/GraphicBufferAllocator.h | 0 .../base/include/ui/GraphicBufferMapper.h | 0 .../frameworks/base/include/ui/GraphicLog.h | 0 .../frameworks/base/include/ui/IOverlay.h | 0 .../frameworks/base/include/ui/Input.h | 0 .../base/include/ui/InputDispatcher.h | 0 .../frameworks/base/include/ui/InputManager.h | 0 .../frameworks/base/include/ui/InputReader.h | 0 .../base/include/ui/InputTransport.h | 0 .../base/include/ui/KeyCharacterMap.h | 0 .../base/include/ui/KeycodeLabels.h | 0 .../frameworks/base/include/ui/Overlay.h | 0 .../frameworks/base/include/ui/PixelFormat.h | 0 .../frameworks/base/include/ui/Point.h | 0 .../frameworks/base/include/ui/PowerManager.h | 0 .../frameworks/base/include/ui/Rect.h | 0 .../frameworks/base/include/ui/Region.h | 0 .../base/include/ui/android_native_buffer.h | 0 .../base/include/ui/egl/android_natives.h | 0 .../frameworks/base/include/utils/Asset.h | 0 .../frameworks/base/include/utils/AssetDir.h | 0 .../base/include/utils/AssetManager.h | 0 .../frameworks/base/include/utils/Atomic.h | 0 .../base/include/utils/BackupHelpers.h | 0 .../frameworks/base/include/utils/BitSet.h | 0 .../base/include/utils/BufferedTextOutput.h | 0 .../frameworks/base/include/utils/ByteOrder.h | 0 .../frameworks/base/include/utils/CallStack.h | 0 .../frameworks/base/include/utils/Debug.h | 0 .../frameworks/base/include/utils/Endian.h | 0 .../frameworks/base/include/utils/Errors.h | 0 .../frameworks/base/include/utils/FileMap.h | 0 .../base/include/utils/Flattenable.h | 0 .../base/include/utils/KeyedVector.h | 0 .../frameworks/base/include/utils/List.h | 0 .../frameworks/base/include/utils/Log.h | 0 .../frameworks/base/include/utils/Looper.h | 0 .../frameworks/base/include/utils/ObbFile.h | 0 .../include/utils/PackageRedirectionMap.h | 0 .../frameworks/base/include/utils/Pool.h | 0 .../frameworks/base/include/utils/RefBase.h | 0 .../base/include/utils/ResourceTypes.h | 0 .../base/include/utils/SharedBuffer.h | 0 .../frameworks/base/include/utils/Singleton.h | 0 .../base/include/utils/SortedVector.h | 0 .../frameworks/base/include/utils/StopWatch.h | 0 .../base/include/utils/StreamingZipInflater.h | 0 .../frameworks/base/include/utils/String16.h | 0 .../frameworks/base/include/utils/String8.h | 0 .../base/include/utils/StringArray.h | 0 .../base/include/utils/SystemClock.h | 0 .../base/include/utils/TextOutput.h | 0 .../frameworks/base/include/utils/Timers.h | 0 .../base/include/utils/TypeHelpers.h | 0 .../frameworks/base/include/utils/Vector.h | 0 .../base/include/utils/VectorImpl.h | 0 .../frameworks/base/include/utils/ZipEntry.h | 0 .../frameworks/base/include/utils/ZipFile.h | 0 .../base/include/utils/ZipFileCRO.h | 0 .../frameworks/base/include/utils/ZipFileRO.h | 0 .../frameworks/base/include/utils/ZipUtils.h | 0 .../frameworks/base/include/utils/ashmem.h | 0 .../frameworks/base/include/utils/misc.h | 0 .../frameworks/base/include/utils/threads.h | 0 .../libhardware/include/hardware/copybit.h | 0 .../libhardware/include/hardware/gps.h | 0 .../libhardware/include/hardware/gralloc.h | 0 .../libhardware/include/hardware/hardware.h | 0 .../libhardware/include/hardware/lights.h | 0 .../libhardware/include/hardware/overlay.h | 0 .../libhardware/include/hardware/qemud.h | 0 .../libhardware/include/hardware/sensors.h | 0 .../include/hardware/sensors_deprecated.h | 0 .../system/core/include/acc/acc.h | 0 .../system/core/include/android/log.h | 0 .../include/arch/darwin-x86/AndroidConfig.h | 0 .../include/arch/freebsd-x86/AndroidConfig.h | 0 .../include/arch/linux-arm/AndroidConfig.h | 0 .../include/arch/linux-sh/AndroidConfig.h | 0 .../include/arch/linux-x86/AndroidConfig.h | 0 .../arch/target_linux-x86/AndroidConfig.h | 0 .../core/include/arch/windows/AndroidConfig.h | 0 .../system/core/include/ctest/ctest.h | 0 .../system/core/include/cutils/abort_socket.h | 0 .../system/core/include/cutils/array.h | 0 .../system/core/include/cutils/ashmem.h | 0 .../system/core/include/cutils/atomic-arm.h | 0 .../core/include/cutils/atomic-inline.h | 0 .../system/core/include/cutils/atomic-x86.h | 0 .../system/core/include/cutils/atomic.h | 0 .../system/core/include/cutils/compiler.h | 0 .../system/core/include/cutils/config_utils.h | 0 .../system/core/include/cutils/cpu_info.h | 0 .../system/core/include/cutils/dir_hash.h | 0 .../core/include/cutils/event_tag_map.h | 0 .../system/core/include/cutils/hashmap.h | 0 .../core/include/cutils/iosched_policy.h | 0 .../system/core/include/cutils/jstring.h | 0 .../system/core/include/cutils/log.h | 0 .../system/core/include/cutils/logd.h | 0 .../system/core/include/cutils/logger.h | 0 .../system/core/include/cutils/logprint.h | 0 .../system/core/include/cutils/memory.h | 0 .../system/core/include/cutils/misc.h | 0 .../system/core/include/cutils/mq.h | 0 .../system/core/include/cutils/mspace.h | 0 .../core/include/cutils/native_handle.h | 0 .../core/include/cutils/open_memstream.h | 0 .../system/core/include/cutils/process_name.h | 0 .../system/core/include/cutils/properties.h | 0 .../core/include/cutils/record_stream.h | 0 .../system/core/include/cutils/sched_policy.h | 0 .../system/core/include/cutils/selector.h | 0 .../system/core/include/cutils/sockets.h | 0 .../system/core/include/cutils/threads.h | 0 .../system/core/include/cutils/tztime.h | 0 .../system/core/include/cutils/uio.h | 0 .../system/core/include/cutils/zygote.h | 0 .../core/include/diskconfig/diskconfig.h | 0 .../system/core/include/mincrypt/rsa.h | 0 .../system/core/include/mincrypt/sha.h | 0 .../system/core/include/pixelflinger/format.h | 0 .../core/include/pixelflinger/pixelflinger.h | 0 .../private/android_filesystem_config.h | 0 .../private/pixelflinger/ggl_context.h | 0 .../include/private/pixelflinger/ggl_fixed.h | 0 .../system/core/include/reboot/reboot.h | 0 .../core/include/sysutils/FrameworkClient.h | 0 .../core/include/sysutils/FrameworkCommand.h | 0 .../core/include/sysutils/FrameworkListener.h | 0 .../core/include/sysutils/NetlinkEvent.h | 0 .../core/include/sysutils/NetlinkListener.h | 0 .../core/include/sysutils/ServiceManager.h | 0 .../core/include/sysutils/SocketClient.h | 0 .../core/include/sysutils/SocketListener.h | 0 .../system/core/include/zipfile/zipfile.h | 0 .../include/android_runtime/ActivityManager.h | 0 .../include/android_runtime/AndroidRuntime.h | 0 .../android_app_NativeActivity.h | 0 .../android_content_res_Configuration.h | 0 .../android_graphics_SurfaceTexture.h | 0 .../android_util_AssetManager.h | 0 .../android_runtime/android_view_Surface.h | 0 .../frameworks/base/include/binder/Binder.h | 0 .../base/include/binder/BinderService.h | 0 .../frameworks/base/include/binder/BpBinder.h | 0 .../base/include/binder/CursorWindow.h | 0 .../frameworks/base/include/binder/IBinder.h | 0 .../base/include/binder/IInterface.h | 0 .../frameworks/base/include/binder/IMemory.h | 0 .../base/include/binder/IPCThreadState.h | 0 .../include/binder/IPermissionController.h | 0 .../base/include/binder/IServiceManager.h | 0 .../base/include/binder/MemoryBase.h | 0 .../base/include/binder/MemoryDealer.h | 0 .../base/include/binder/MemoryHeapBase.h | 0 .../base/include/binder/MemoryHeapPmem.h | 0 .../frameworks/base/include/binder/Parcel.h | 0 .../base/include/binder/Permission.h | 0 .../base/include/binder/ProcessState.h | 0 .../frameworks/base/include/camera/Camera.h | 0 .../include/camera/CameraHardwareInterface.h | 0 .../base/include/camera/CameraParameters.h | 0 .../frameworks/base/include/camera/ICamera.h | 0 .../base/include/camera/ICameraClient.h | 0 .../base/include/camera/ICameraService.h | 0 .../base/include/diskusage/dirsize.h | 0 .../base/include/drm/DrmConstraints.h | 0 .../base/include/drm/DrmConvertedStatus.h | 0 .../frameworks/base/include/drm/DrmInfo.h | 0 .../base/include/drm/DrmInfoEvent.h | 0 .../base/include/drm/DrmInfoRequest.h | 0 .../base/include/drm/DrmInfoStatus.h | 0 .../base/include/drm/DrmManagerClient.h | 0 .../frameworks/base/include/drm/DrmMetadata.h | 0 .../frameworks/base/include/drm/DrmRights.h | 0 .../base/include/drm/DrmSupportInfo.h | 0 .../base/include/drm/drm_framework_common.h | 0 .../base/include/gui/ISensorEventConnection.h | 0 .../base/include/gui/ISensorServer.h | 0 .../base/include/gui/ISurfaceTexture.h | 0 .../frameworks/base/include/gui/Sensor.h | 0 .../base/include/gui/SensorChannel.h | 0 .../base/include/gui/SensorEventQueue.h | 0 .../base/include/gui/SensorManager.h | 0 .../base/include/gui/SurfaceTexture.h | 0 .../base/include/gui/SurfaceTextureClient.h | 0 .../base/include/media/AudioEffect.h | 0 .../base/include/media/AudioRecord.h | 0 .../base/include/media/AudioSystem.h | 0 .../base/include/media/AudioTrack.h | 0 .../frameworks/base/include/media/EffectApi.h | 0 .../base/include/media/EffectBassBoostApi.h | 0 .../media/EffectEnvironmentalReverbApi.h | 0 .../base/include/media/EffectEqualizerApi.h | 0 .../include/media/EffectPresetReverbApi.h | 0 .../base/include/media/EffectVirtualizerApi.h | 0 .../base/include/media/EffectVisualizerApi.h | 0 .../base/include/media/EffectsFactoryApi.h | 0 .../base/include/media/IAudioFlinger.h | 0 .../base/include/media/IAudioFlingerClient.h | 0 .../base/include/media/IAudioPolicyService.h | 0 .../base/include/media/IAudioRecord.h | 0 .../base/include/media/IAudioTrack.h | 0 .../frameworks/base/include/media/IEffect.h | 0 .../base/include/media/IEffectClient.h | 0 .../base/include/media/IMediaDeathNotifier.h | 0 .../include/media/IMediaMetadataRetriever.h | 0 .../base/include/media/IMediaPlayer.h | 0 .../base/include/media/IMediaPlayerClient.h | 0 .../base/include/media/IMediaPlayerService.h | 0 .../base/include/media/IMediaRecorder.h | 0 .../base/include/media/IMediaRecorderClient.h | 0 .../frameworks/base/include/media/IOMX.h | 0 .../base/include/media/IStreamSource.h | 0 .../frameworks/base/include/media/JetPlayer.h | 0 .../media/MediaMetadataRetrieverInterface.h | 0 .../base/include/media/MediaPlayerInterface.h | 0 .../base/include/media/MediaProfiles.h | 0 .../base/include/media/MediaRecorderBase.h | 0 .../frameworks/base/include/media/Metadata.h | 0 .../base/include/media/ToneGenerator.h | 0 .../base/include/media/Visualizer.h | 0 .../include/media/mediametadataretriever.h | 0 .../base/include/media/mediaplayer.h | 0 .../base/include/media/mediarecorder.h | 0 .../base/include/media/mediascanner.h | 0 .../base/include/media/stagefright/ACodec.h | 0 .../include/media/stagefright/AMRWriter.h | 0 .../include/media/stagefright/AudioPlayer.h | 0 .../include/media/stagefright/AudioSource.h | 0 .../include/media/stagefright/CameraSource.h | 0 .../media/stagefright/CameraSourceTimeLapse.h | 0 .../media/stagefright/ColorConverter.h | 0 .../include/media/stagefright/DataSource.h | 0 .../include/media/stagefright/FileSource.h | 0 .../include/media/stagefright/HardwareAPI.h | 0 .../include/media/stagefright/JPEGSource.h | 0 .../include/media/stagefright/MPEG2TSWriter.h | 0 .../include/media/stagefright/MPEG4Writer.h | 0 .../include/media/stagefright/MediaBuffer.h | 0 .../media/stagefright/MediaBufferGroup.h | 0 .../include/media/stagefright/MediaDebug.h | 0 .../include/media/stagefright/MediaDefs.h | 0 .../include/media/stagefright/MediaErrors.h | 0 .../media/stagefright/MediaExtractor.h | 0 .../include/media/stagefright/MediaSource.h | 0 .../media/stagefright/MediaSourceSplitter.h | 0 .../include/media/stagefright/MediaWriter.h | 0 .../base/include/media/stagefright/MetaData.h | 0 .../media/stagefright/NativeWindowWrapper.h | 0 .../include/media/stagefright/OMXClient.h | 0 .../base/include/media/stagefright/OMXCodec.h | 0 .../include/media/stagefright/OMXPluginBase.h | 0 .../media/stagefright/ShoutcastSource.h | 0 .../stagefright/StagefrightMediaScanner.h | 0 .../include/media/stagefright/TimeSource.h | 0 .../base/include/media/stagefright/Utils.h | 0 .../stagefright/VideoSourceDownSampler.h | 0 .../include/media/stagefright/YUVCanvas.h | 0 .../base/include/media/stagefright/YUVImage.h | 0 .../media/stagefright/foundation/AAtomizer.h | 0 .../media/stagefright/foundation/ABase.h | 0 .../media/stagefright/foundation/ABitReader.h | 0 .../media/stagefright/foundation/ABuffer.h | 0 .../media/stagefright/foundation/ADebug.h | 0 .../media/stagefright/foundation/AHandler.h | 0 .../foundation/AHandlerReflector.h | 0 .../foundation/AHierarchicalStateMachine.h | 0 .../media/stagefright/foundation/ALooper.h | 0 .../stagefright/foundation/ALooperRoster.h | 0 .../media/stagefright/foundation/AMessage.h | 0 .../media/stagefright/foundation/AString.h | 0 .../media/stagefright/foundation/base64.h | 0 .../media/stagefright/foundation/hexdump.h | 0 .../media/stagefright/openmax/OMX_Audio.h | 0 .../media/stagefright/openmax/OMX_Component.h | 0 .../stagefright/openmax/OMX_ContentPipe.h | 0 .../media/stagefright/openmax/OMX_Core.h | 0 .../media/stagefright/openmax/OMX_IVCommon.h | 0 .../media/stagefright/openmax/OMX_Image.h | 0 .../media/stagefright/openmax/OMX_Index.h | 0 .../media/stagefright/openmax/OMX_Other.h | 0 .../media/stagefright/openmax/OMX_Types.h | 0 .../media/stagefright/openmax/OMX_Video.h | 0 .../base/include/media/thread_init.h | 0 .../base/include/pim/EventRecurrence.h | 0 .../frameworks/base/include/private/README | 0 .../base/include/private/binder/Static.h | 0 .../include/private/binder/binder_module.h | 0 .../base/include/private/hwui/DrawGlInfo.h | 0 .../include/private/media/AudioEffectShared.h | 0 .../include/private/media/AudioTrackShared.h | 0 .../base/include/private/media/VideoFrame.h | 0 .../include/private/opengles/gl_context.h | 0 .../private/surfaceflinger/LayerState.h | 0 .../surfaceflinger/SharedBufferStack.h | 0 .../base/include/private/ui/RegionHelper.h | 0 .../include/private/ui/android_natives_priv.h | 0 .../base/include/private/utils/Static.h | 0 .../base/include/storage/IMountService.h | 0 .../include/storage/IMountServiceListener.h | 0 .../include/storage/IMountShutdownObserver.h | 0 .../base/include/storage/IObbActionListener.h | 0 .../surfaceflinger/IGraphicBufferAlloc.h | 0 .../base/include/surfaceflinger/ISurface.h | 0 .../include/surfaceflinger/ISurfaceComposer.h | 0 .../surfaceflinger/ISurfaceComposerClient.h | 0 .../base/include/surfaceflinger/Surface.h | 0 .../surfaceflinger/SurfaceComposerClient.h | 0 .../frameworks/base/include/tts/TtsEngine.h | 0 .../frameworks/base/include/ui/DisplayInfo.h | 0 .../base/include/ui/EGLNativeSurface.h | 0 .../frameworks/base/include/ui/EGLUtils.h | 0 .../base/include/ui/FramebufferNativeWindow.h | 0 .../base/include/ui/GraphicBuffer.h | 0 .../base/include/ui/GraphicBufferAllocator.h | 0 .../base/include/ui/GraphicBufferMapper.h | 0 .../frameworks/base/include/ui/GraphicLog.h | 0 .../frameworks/base/include/ui/Input.h | 0 .../base/include/ui/InputTransport.h | 0 .../base/include/ui/KeyCharacterMap.h | 0 .../frameworks/base/include/ui/KeyLayoutMap.h | 0 .../frameworks/base/include/ui/Keyboard.h | 0 .../base/include/ui/KeycodeLabels.h | 0 .../frameworks/base/include/ui/PixelFormat.h | 0 .../frameworks/base/include/ui/Point.h | 0 .../frameworks/base/include/ui/PowerManager.h | 0 .../frameworks/base/include/ui/Rect.h | 0 .../frameworks/base/include/ui/Region.h | 0 .../base/include/ui/VirtualKeyMap.h | 0 .../base/include/ui/android_native_buffer.h | 0 .../base/include/ui/egl/android_natives.h | 0 .../frameworks/base/include/utils/Asset.h | 0 .../frameworks/base/include/utils/AssetDir.h | 0 .../base/include/utils/AssetManager.h | 0 .../frameworks/base/include/utils/Atomic.h | 0 .../base/include/utils/BackupHelpers.h | 0 .../frameworks/base/include/utils/BitSet.h | 0 .../base/include/utils/BufferedTextOutput.h | 0 .../frameworks/base/include/utils/ByteOrder.h | 0 .../frameworks/base/include/utils/CallStack.h | 0 .../frameworks/base/include/utils/Compat.h | 0 .../frameworks/base/include/utils/Debug.h | 0 .../frameworks/base/include/utils/Endian.h | 0 .../frameworks/base/include/utils/Errors.h | 0 .../frameworks/base/include/utils/FileMap.h | 0 .../base/include/utils/Flattenable.h | 0 .../frameworks/base/include/utils/Functor.h | 0 .../base/include/utils/KeyedVector.h | 0 .../frameworks/base/include/utils/List.h | 0 .../frameworks/base/include/utils/Log.h | 0 .../frameworks/base/include/utils/Looper.h | 0 .../frameworks/base/include/utils/ObbFile.h | 0 .../frameworks/base/include/utils/Pool.h | 0 .../base/include/utils/PropertyMap.h | 0 .../frameworks/base/include/utils/RefBase.h | 0 .../base/include/utils/ResourceTypes.h | 0 .../base/include/utils/SharedBuffer.h | 0 .../frameworks/base/include/utils/Singleton.h | 0 .../base/include/utils/SortedVector.h | 0 .../frameworks/base/include/utils/StopWatch.h | 0 .../base/include/utils/StreamingZipInflater.h | 0 .../frameworks/base/include/utils/String16.h | 0 .../frameworks/base/include/utils/String8.h | 0 .../base/include/utils/StringArray.h | 0 .../base/include/utils/StrongPointer.h | 0 .../base/include/utils/SystemClock.h | 0 .../base/include/utils/TextOutput.h | 0 .../frameworks/base/include/utils/Timers.h | 0 .../frameworks/base/include/utils/Tokenizer.h | 0 .../base/include/utils/TypeHelpers.h | 0 .../frameworks/base/include/utils/Unicode.h | 0 .../frameworks/base/include/utils/Vector.h | 0 .../base/include/utils/VectorImpl.h | 0 .../base/include/utils/ZipFileCRO.h | 0 .../frameworks/base/include/utils/ZipFileRO.h | 0 .../frameworks/base/include/utils/ZipUtils.h | 0 .../frameworks/base/include/utils/ashmem.h | 0 .../frameworks/base/include/utils/misc.h | 0 .../frameworks/base/include/utils/threads.h | 0 .../native/include/android/asset_manager.h | 0 .../include/android/asset_manager_jni.h | 0 .../base/native/include/android/bitmap.h | 0 .../native/include/android/configuration.h | 0 .../base/native/include/android/input.h | 0 .../base/native/include/android/keycodes.h | 0 .../base/native/include/android/looper.h | 0 .../native/include/android/native_activity.h | 0 .../native/include/android/native_window.h | 0 .../include/android/native_window_jni.h | 0 .../base/native/include/android/obb.h | 0 .../base/native/include/android/rect.h | 0 .../base/native/include/android/sensor.h | 0 .../native/include/android/storage_manager.h | 0 .../base/native/include/android/tts.h | 0 .../base/native/include/android/window.h | 0 .../libhardware/include/hardware/audio.h | 0 .../libhardware/include/hardware/audio_hal.h | 0 .../include/hardware/audio_policy.h | 0 .../include/hardware/audio_policy_hal.h | 0 .../libhardware/include/hardware/camera.h | 0 .../libhardware/include/hardware/gps.h | 0 .../libhardware/include/hardware/gralloc.h | 0 .../libhardware/include/hardware/hardware.h | 0 .../libhardware/include/hardware/hwcomposer.h | 0 .../libhardware/include/hardware/lights.h | 0 .../libhardware/include/hardware/qemu_pipe.h | 0 .../libhardware/include/hardware/qemud.h | 0 .../libhardware/include/hardware/sensors.h | 0 .../system/core/include/android/log.h | 0 .../include/arch/darwin-x86/AndroidConfig.h | 0 .../include/arch/freebsd-x86/AndroidConfig.h | 0 .../include/arch/linux-arm/AndroidConfig.h | 0 .../include/arch/linux-ppc/AndroidConfig.h | 0 .../include/arch/linux-sh/AndroidConfig.h | 0 .../include/arch/linux-x86/AndroidConfig.h | 0 .../arch/target_linux-x86/AndroidConfig.h | 0 .../core/include/arch/windows/AndroidConfig.h | 0 .../system/core/include/ctest/ctest.h | 0 .../system/core/include/cutils/abort_socket.h | 0 .../core/include/cutils/android_reboot.h | 0 .../system/core/include/cutils/array.h | 0 .../system/core/include/cutils/ashmem.h | 0 .../system/core/include/cutils/atomic-arm.h | 0 .../core/include/cutils/atomic-inline.h | 0 .../system/core/include/cutils/atomic-x86.h | 0 .../system/core/include/cutils/atomic.h | 0 .../system/core/include/cutils/bitops.h | 0 .../system/core/include/cutils/compiler.h | 0 .../system/core/include/cutils/config_utils.h | 0 .../system/core/include/cutils/cpu_info.h | 0 .../system/core/include/cutils/dir_hash.h | 0 .../core/include/cutils/event_tag_map.h | 0 .../system/core/include/cutils/hashmap.h | 0 .../core/include/cutils/iosched_policy.h | 0 .../system/core/include/cutils/jstring.h | 0 .../system/core/include/cutils/klog.h | 0 .../system/core/include/cutils/list.h | 0 .../system/core/include/cutils/log.h | 0 .../system/core/include/cutils/logd.h | 0 .../system/core/include/cutils/logger.h | 0 .../system/core/include/cutils/logprint.h | 0 .../system/core/include/cutils/memory.h | 0 .../system/core/include/cutils/misc.h | 0 .../system/core/include/cutils/mq.h | 0 .../system/core/include/cutils/mspace.h | 0 .../core/include/cutils/native_handle.h | 0 .../core/include/cutils/open_memstream.h | 0 .../core/include/cutils/partition_utils.h | 0 .../system/core/include/cutils/process_name.h | 0 .../system/core/include/cutils/properties.h | 0 .../system/core/include/cutils/qtaguid.h | 0 .../core/include/cutils/record_stream.h | 0 .../system/core/include/cutils/sched_policy.h | 0 .../system/core/include/cutils/selector.h | 0 .../system/core/include/cutils/sockets.h | 0 .../system/core/include/cutils/str_parms.h | 0 .../system/core/include/cutils/threads.h | 0 .../system/core/include/cutils/tztime.h | 0 .../system/core/include/cutils/uevent.h | 0 .../system/core/include/cutils/uio.h | 0 .../system/core/include/cutils/zygote.h | 0 .../core/include/diskconfig/diskconfig.h | 0 .../system/core/include/mincrypt/rsa.h | 0 .../system/core/include/mincrypt/sha.h | 0 .../system/core/include/netutils/dhcp.h | 0 .../system/core/include/netutils/ifc.h | 0 .../system/core/include/pixelflinger/format.h | 0 .../core/include/pixelflinger/pixelflinger.h | 0 .../private/android_filesystem_config.h | 0 .../private/pixelflinger/ggl_context.h | 0 .../include/private/pixelflinger/ggl_fixed.h | 0 .../system/core/include/system/audio.h | 0 .../system/core/include/system/audio_policy.h | 0 .../system/core/include/system/camera.h | 0 .../system/core/include/system/graphics.h | 0 .../system/core/include/system/window.h | 0 .../core/include/sysutils/FrameworkClient.h | 0 .../core/include/sysutils/FrameworkCommand.h | 0 .../core/include/sysutils/FrameworkListener.h | 0 .../core/include/sysutils/NetlinkEvent.h | 0 .../core/include/sysutils/NetlinkListener.h | 0 .../core/include/sysutils/ServiceManager.h | 0 .../core/include/sysutils/SocketClient.h | 0 .../core/include/sysutils/SocketListener.h | 0 .../system/core/include/usbhost/usbhost.h | 0 .../system/core/include/zipfile/zipfile.h | 0 .../include/android_runtime/ActivityManager.h | 0 .../include/android_runtime/AndroidRuntime.h | 0 .../android_app_NativeActivity.h | 0 .../android_content_res_Configuration.h | 0 .../android_graphics_SurfaceTexture.h | 0 .../android_util_AssetManager.h | 0 .../android_runtime/android_view_Surface.h | 0 .../frameworks/base/include/binder/Binder.h | 0 .../base/include/binder/BinderService.h | 0 .../frameworks/base/include/binder/BpBinder.h | 0 .../base/include/binder/CursorWindow.h | 0 .../frameworks/base/include/binder/IBinder.h | 0 .../base/include/binder/IInterface.h | 0 .../frameworks/base/include/binder/IMemory.h | 0 .../base/include/binder/IPCThreadState.h | 0 .../include/binder/IPermissionController.h | 0 .../base/include/binder/IServiceManager.h | 0 .../base/include/binder/MemoryBase.h | 0 .../base/include/binder/MemoryDealer.h | 0 .../base/include/binder/MemoryHeapBase.h | 0 .../base/include/binder/MemoryHeapPmem.h | 0 .../frameworks/base/include/binder/Parcel.h | 0 .../base/include/binder/PermissionCache.h | 0 .../base/include/binder/ProcessState.h | 0 .../frameworks/base/include/camera/Camera.h | 0 .../base/include/camera/CameraParameters.h | 0 .../frameworks/base/include/camera/ICamera.h | 0 .../base/include/camera/ICameraClient.h | 0 .../include/camera/ICameraRecordingProxy.h | 0 .../camera/ICameraRecordingProxyListener.h | 0 .../base/include/camera/ICameraService.h | 0 .../cpustats/CentralTendencyStatistics.h | 0 .../base/include/cpustats/README.txt | 0 .../base/include/cpustats/ThreadCpuUsage.h | 0 .../base/include/diskusage/dirsize.h | 0 .../base/include/drm/DrmConstraints.h | 0 .../base/include/drm/DrmConvertedStatus.h | 0 .../frameworks/base/include/drm/DrmInfo.h | 0 .../base/include/drm/DrmInfoEvent.h | 0 .../base/include/drm/DrmInfoRequest.h | 0 .../base/include/drm/DrmInfoStatus.h | 0 .../base/include/drm/DrmManagerClient.h | 0 .../frameworks/base/include/drm/DrmMetadata.h | 0 .../frameworks/base/include/drm/DrmRights.h | 0 .../base/include/drm/DrmSupportInfo.h | 0 .../base/include/drm/drm_framework_common.h | 0 .../base/include/gui/ISensorEventConnection.h | 0 .../base/include/gui/ISensorServer.h | 0 .../base/include/gui/ISurfaceTexture.h | 0 .../frameworks/base/include/gui/Sensor.h | 0 .../base/include/gui/SensorChannel.h | 0 .../base/include/gui/SensorEventQueue.h | 0 .../base/include/gui/SensorManager.h | 0 .../base/include/gui/SurfaceTexture.h | 0 .../base/include/gui/SurfaceTextureClient.h | 0 .../base/include/media/AudioEffect.h | 0 .../base/include/media/AudioParameter.h | 0 .../base/include/media/AudioRecord.h | 0 .../base/include/media/AudioSystem.h | 0 .../base/include/media/AudioTrack.h | 0 .../base/include/media/EffectsFactoryApi.h | 0 .../base/include/media/IAudioFlinger.h | 0 .../base/include/media/IAudioFlingerClient.h | 0 .../base/include/media/IAudioPolicyService.h | 0 .../base/include/media/IAudioRecord.h | 0 .../base/include/media/IAudioTrack.h | 0 .../frameworks/base/include/media/IEffect.h | 0 .../base/include/media/IEffectClient.h | 0 .../base/include/media/IMediaDeathNotifier.h | 0 .../include/media/IMediaMetadataRetriever.h | 0 .../base/include/media/IMediaPlayer.h | 0 .../base/include/media/IMediaPlayerClient.h | 0 .../base/include/media/IMediaPlayerService.h | 0 .../base/include/media/IMediaRecorder.h | 0 .../base/include/media/IMediaRecorderClient.h | 0 .../frameworks/base/include/media/IOMX.h | 0 .../base/include/media/IStreamSource.h | 0 .../frameworks/base/include/media/JetPlayer.h | 0 .../media/MediaMetadataRetrieverInterface.h | 0 .../base/include/media/MediaPlayerInterface.h | 0 .../base/include/media/MediaProfiles.h | 0 .../base/include/media/MediaRecorderBase.h | 0 .../base/include/media/MemoryLeakTrackUtil.h | 0 .../frameworks/base/include/media/Metadata.h | 0 .../base/include/media/ToneGenerator.h | 0 .../base/include/media/Visualizer.h | 0 .../include/media/mediametadataretriever.h | 0 .../base/include/media/mediaplayer.h | 0 .../base/include/media/mediarecorder.h | 0 .../base/include/media/mediascanner.h | 0 .../include/media/stagefright/AACWriter.h | 0 .../base/include/media/stagefright/ACodec.h | 0 .../include/media/stagefright/AMRWriter.h | 0 .../include/media/stagefright/AudioPlayer.h | 0 .../include/media/stagefright/AudioSource.h | 0 .../include/media/stagefright/CameraSource.h | 0 .../media/stagefright/CameraSourceTimeLapse.h | 0 .../media/stagefright/ColorConverter.h | 0 .../include/media/stagefright/DataSource.h | 0 .../include/media/stagefright/FileSource.h | 0 .../include/media/stagefright/HardwareAPI.h | 0 .../include/media/stagefright/JPEGSource.h | 0 .../include/media/stagefright/MPEG2TSWriter.h | 0 .../include/media/stagefright/MPEG4Writer.h | 0 .../include/media/stagefright/MediaBuffer.h | 0 .../media/stagefright/MediaBufferGroup.h | 0 .../include/media/stagefright/MediaDebug.h | 0 .../include/media/stagefright/MediaDefs.h | 0 .../include/media/stagefright/MediaErrors.h | 0 .../media/stagefright/MediaExtractor.h | 0 .../include/media/stagefright/MediaSource.h | 0 .../media/stagefright/MediaSourceSplitter.h | 0 .../include/media/stagefright/MediaWriter.h | 0 .../base/include/media/stagefright/MetaData.h | 0 .../media/stagefright/MetadataBufferType.h | 0 .../media/stagefright/NativeWindowWrapper.h | 0 .../include/media/stagefright/OMXClient.h | 0 .../base/include/media/stagefright/OMXCodec.h | 0 .../include/media/stagefright/OMXPluginBase.h | 0 .../stagefright/StagefrightMediaScanner.h | 0 .../media/stagefright/SurfaceMediaSource.h | 0 .../include/media/stagefright/TimeSource.h | 0 .../base/include/media/stagefright/Utils.h | 0 .../stagefright/VideoSourceDownSampler.h | 0 .../include/media/stagefright/YUVCanvas.h | 0 .../base/include/media/stagefright/YUVImage.h | 0 .../media/stagefright/foundation/AAtomizer.h | 0 .../media/stagefright/foundation/ABase.h | 0 .../media/stagefright/foundation/ABitReader.h | 0 .../media/stagefright/foundation/ABuffer.h | 0 .../media/stagefright/foundation/ADebug.h | 0 .../media/stagefright/foundation/AHandler.h | 0 .../foundation/AHandlerReflector.h | 0 .../foundation/AHierarchicalStateMachine.h | 0 .../media/stagefright/foundation/ALooper.h | 0 .../stagefright/foundation/ALooperRoster.h | 0 .../media/stagefright/foundation/AMessage.h | 0 .../media/stagefright/foundation/AString.h | 0 .../media/stagefright/foundation/base64.h | 0 .../media/stagefright/foundation/hexdump.h | 0 .../media/stagefright/openmax/OMX_Audio.h | 0 .../media/stagefright/openmax/OMX_Component.h | 0 .../stagefright/openmax/OMX_ContentPipe.h | 0 .../media/stagefright/openmax/OMX_Core.h | 0 .../media/stagefright/openmax/OMX_IVCommon.h | 0 .../media/stagefright/openmax/OMX_Image.h | 0 .../media/stagefright/openmax/OMX_Index.h | 0 .../media/stagefright/openmax/OMX_Other.h | 0 .../media/stagefright/openmax/OMX_Types.h | 0 .../media/stagefright/openmax/OMX_Video.h | 0 .../base/include/media/thread_init.h | 0 .../base/include/powermanager/IPowerManager.h | 0 .../base/include/powermanager/PowerManager.h | 0 .../frameworks/base/include/private/README | 0 .../base/include/private/binder/Static.h | 0 .../include/private/binder/binder_module.h | 0 .../base/include/private/hwui/DrawGlInfo.h | 0 .../include/private/media/AudioEffectShared.h | 0 .../include/private/media/AudioTrackShared.h | 0 .../base/include/private/media/VideoFrame.h | 0 .../include/private/opengles/gl_context.h | 0 .../private/surfaceflinger/LayerState.h | 0 .../surfaceflinger/SharedBufferStack.h | 0 .../base/include/private/ui/RegionHelper.h | 0 .../include/private/ui/android_natives_priv.h | 0 .../base/include/private/utils/Static.h | 0 .../base/include/storage/IMountService.h | 0 .../include/storage/IMountServiceListener.h | 0 .../include/storage/IMountShutdownObserver.h | 0 .../base/include/storage/IObbActionListener.h | 0 .../surfaceflinger/IGraphicBufferAlloc.h | 0 .../base/include/surfaceflinger/ISurface.h | 0 .../include/surfaceflinger/ISurfaceComposer.h | 0 .../surfaceflinger/ISurfaceComposerClient.h | 0 .../base/include/surfaceflinger/Surface.h | 0 .../surfaceflinger/SurfaceComposerClient.h | 0 .../frameworks/base/include/ui/DisplayInfo.h | 0 .../base/include/ui/EGLNativeSurface.h | 0 .../frameworks/base/include/ui/EGLUtils.h | 0 .../base/include/ui/FramebufferNativeWindow.h | 0 .../base/include/ui/GraphicBuffer.h | 0 .../base/include/ui/GraphicBufferAllocator.h | 0 .../base/include/ui/GraphicBufferMapper.h | 0 .../frameworks/base/include/ui/GraphicLog.h | 0 .../frameworks/base/include/ui/Input.h | 0 .../base/include/ui/InputTransport.h | 0 .../base/include/ui/KeyCharacterMap.h | 0 .../frameworks/base/include/ui/KeyLayoutMap.h | 0 .../frameworks/base/include/ui/Keyboard.h | 0 .../base/include/ui/KeycodeLabels.h | 0 .../frameworks/base/include/ui/PixelFormat.h | 0 .../frameworks/base/include/ui/Point.h | 0 .../frameworks/base/include/ui/PowerManager.h | 0 .../frameworks/base/include/ui/Rect.h | 0 .../frameworks/base/include/ui/Region.h | 0 .../base/include/ui/VirtualKeyMap.h | 0 .../base/include/ui/android_native_buffer.h | 0 .../base/include/ui/egl/android_natives.h | 0 .../frameworks/base/include/utils/Asset.h | 0 .../frameworks/base/include/utils/AssetDir.h | 0 .../base/include/utils/AssetManager.h | 0 .../frameworks/base/include/utils/Atomic.h | 0 .../base/include/utils/BackupHelpers.h | 0 .../frameworks/base/include/utils/BitSet.h | 0 .../frameworks/base/include/utils/BlobCache.h | 0 .../base/include/utils/BufferedTextOutput.h | 0 .../frameworks/base/include/utils/ByteOrder.h | 0 .../frameworks/base/include/utils/CallStack.h | 0 .../frameworks/base/include/utils/Compat.h | 0 .../frameworks/base/include/utils/Debug.h | 0 .../frameworks/base/include/utils/Endian.h | 0 .../frameworks/base/include/utils/Errors.h | 0 .../frameworks/base/include/utils/FileMap.h | 0 .../base/include/utils/Flattenable.h | 0 .../frameworks/base/include/utils/Functor.h | 0 .../base/include/utils/GenerationCache.h | 0 .../base/include/utils/KeyedVector.h | 0 .../base/include/utils/LinearTransform.h | 0 .../frameworks/base/include/utils/List.h | 0 .../frameworks/base/include/utils/Log.h | 0 .../frameworks/base/include/utils/Looper.h | 0 .../frameworks/base/include/utils/ObbFile.h | 0 .../base/include/utils/PropertyMap.h | 0 .../frameworks/base/include/utils/RefBase.h | 0 .../base/include/utils/ResourceTypes.h | 0 .../base/include/utils/SharedBuffer.h | 0 .../frameworks/base/include/utils/Singleton.h | 0 .../base/include/utils/SortedVector.h | 0 .../frameworks/base/include/utils/StopWatch.h | 0 .../base/include/utils/StreamingZipInflater.h | 0 .../frameworks/base/include/utils/String16.h | 0 .../frameworks/base/include/utils/String8.h | 0 .../base/include/utils/StringArray.h | 0 .../base/include/utils/StrongPointer.h | 0 .../base/include/utils/SystemClock.h | 0 .../base/include/utils/TextOutput.h | 0 .../frameworks/base/include/utils/Timers.h | 0 .../frameworks/base/include/utils/Tokenizer.h | 0 .../base/include/utils/TypeHelpers.h | 0 .../frameworks/base/include/utils/Unicode.h | 0 .../frameworks/base/include/utils/Vector.h | 0 .../base/include/utils/VectorImpl.h | 0 .../base/include/utils/ZipFileCRO.h | 0 .../frameworks/base/include/utils/ZipFileRO.h | 0 .../frameworks/base/include/utils/ZipUtils.h | 0 .../frameworks/base/include/utils/ashmem.h | 0 .../frameworks/base/include/utils/misc.h | 0 .../frameworks/base/include/utils/threads.h | 0 .../native/include/android/asset_manager.h | 0 .../include/android/asset_manager_jni.h | 0 .../base/native/include/android/bitmap.h | 0 .../native/include/android/configuration.h | 0 .../base/native/include/android/input.h | 0 .../base/native/include/android/keycodes.h | 0 .../base/native/include/android/looper.h | 0 .../native/include/android/native_activity.h | 0 .../native/include/android/native_window.h | 0 .../include/android/native_window_jni.h | 0 .../base/native/include/android/obb.h | 0 .../base/native/include/android/rect.h | 0 .../base/native/include/android/sensor.h | 0 .../native/include/android/storage_manager.h | 0 .../base/native/include/android/window.h | 0 .../libhardware/include/hardware/audio.h | 0 .../include/hardware/audio_effect.h | 0 .../include/hardware/audio_policy.h | 0 .../libhardware/include/hardware/camera.h | 0 .../libhardware/include/hardware/fb.h | 0 .../libhardware/include/hardware/gps.h | 0 .../libhardware/include/hardware/gralloc.h | 0 .../libhardware/include/hardware/hardware.h | 0 .../libhardware/include/hardware/hwcomposer.h | 0 .../libhardware/include/hardware/lights.h | 0 .../libhardware/include/hardware/nfc.h | 0 .../libhardware/include/hardware/qemu_pipe.h | 0 .../libhardware/include/hardware/qemud.h | 0 .../libhardware/include/hardware/sensors.h | 0 .../system/core/include/android/log.h | 0 .../include/arch/darwin-x86/AndroidConfig.h | 0 .../include/arch/freebsd-x86/AndroidConfig.h | 0 .../include/arch/linux-arm/AndroidConfig.h | 0 .../include/arch/linux-ppc/AndroidConfig.h | 0 .../include/arch/linux-sh/AndroidConfig.h | 0 .../include/arch/linux-x86/AndroidConfig.h | 0 .../arch/target_linux-x86/AndroidConfig.h | 0 .../core/include/arch/windows/AndroidConfig.h | 0 .../system/core/include/ctest/ctest.h | 0 .../system/core/include/cutils/abort_socket.h | 0 .../core/include/cutils/android_reboot.h | 0 .../system/core/include/cutils/array.h | 0 .../system/core/include/cutils/ashmem.h | 0 .../system/core/include/cutils/atomic-arm.h | 0 .../core/include/cutils/atomic-inline.h | 0 .../system/core/include/cutils/atomic-x86.h | 0 .../system/core/include/cutils/atomic.h | 0 .../system/core/include/cutils/bitops.h | 0 .../system/core/include/cutils/compiler.h | 0 .../system/core/include/cutils/config_utils.h | 0 .../system/core/include/cutils/cpu_info.h | 0 .../system/core/include/cutils/dir_hash.h | 0 .../core/include/cutils/event_tag_map.h | 0 .../system/core/include/cutils/hashmap.h | 0 .../core/include/cutils/iosched_policy.h | 0 .../system/core/include/cutils/jstring.h | 0 .../system/core/include/cutils/klog.h | 0 .../system/core/include/cutils/list.h | 0 .../system/core/include/cutils/log.h | 0 .../system/core/include/cutils/logd.h | 0 .../system/core/include/cutils/logger.h | 0 .../system/core/include/cutils/logprint.h | 0 .../system/core/include/cutils/memory.h | 0 .../system/core/include/cutils/misc.h | 0 .../system/core/include/cutils/mq.h | 0 .../system/core/include/cutils/mspace.h | 0 .../core/include/cutils/native_handle.h | 0 .../core/include/cutils/open_memstream.h | 0 .../core/include/cutils/partition_utils.h | 0 .../system/core/include/cutils/process_name.h | 0 .../system/core/include/cutils/properties.h | 0 .../system/core/include/cutils/qtaguid.h | 0 .../core/include/cutils/record_stream.h | 0 .../system/core/include/cutils/sched_policy.h | 0 .../system/core/include/cutils/selector.h | 0 .../system/core/include/cutils/sockets.h | 0 .../system/core/include/cutils/str_parms.h | 0 .../system/core/include/cutils/threads.h | 0 .../system/core/include/cutils/tztime.h | 0 .../system/core/include/cutils/uevent.h | 0 .../system/core/include/cutils/uio.h | 0 .../system/core/include/cutils/zygote.h | 0 .../core/include/diskconfig/diskconfig.h | 0 .../system/core/include/mincrypt/rsa.h | 0 .../system/core/include/mincrypt/sha.h | 0 .../system/core/include/netutils/dhcp.h | 0 .../system/core/include/netutils/ifc.h | 0 .../system/core/include/pixelflinger/format.h | 0 .../core/include/pixelflinger/pixelflinger.h | 0 .../private/android_filesystem_config.h | 0 .../private/pixelflinger/ggl_context.h | 0 .../include/private/pixelflinger/ggl_fixed.h | 0 .../system/core/include/system/audio.h | 0 .../system/core/include/system/audio_policy.h | 0 .../system/core/include/system/camera.h | 0 .../system/core/include/system/graphics.h | 0 .../system/core/include/system/window.h | 0 .../core/include/sysutils/FrameworkClient.h | 0 .../core/include/sysutils/FrameworkCommand.h | 0 .../core/include/sysutils/FrameworkListener.h | 0 .../core/include/sysutils/NetlinkEvent.h | 0 .../core/include/sysutils/NetlinkListener.h | 0 .../core/include/sysutils/ServiceManager.h | 0 .../core/include/sysutils/SocketClient.h | 0 .../core/include/sysutils/SocketListener.h | 0 .../system/core/include/usbhost/usbhost.h | 0 .../system/core/include/zipfile/zipfile.h | 0 .../av/include/media/AudioBufferProvider.h | 0 .../frameworks/av/include/media/AudioEffect.h | 0 .../av/include/media/AudioParameter.h | 0 .../frameworks/av/include/media/AudioRecord.h | 0 .../frameworks/av/include/media/AudioSystem.h | 0 .../frameworks/av/include/media/AudioTrack.h | 0 .../av/include/media/EffectsFactoryApi.h | 0 .../media/ExtendedAudioBufferProvider.h | 0 .../av/include/media/IAudioFlinger.h | 0 .../av/include/media/IAudioFlingerClient.h | 0 .../av/include/media/IAudioPolicyService.h | 0 .../av/include/media/IAudioRecord.h | 0 .../frameworks/av/include/media/IAudioTrack.h | 0 .../frameworks/av/include/media/ICrypto.h | 0 .../frameworks/av/include/media/IDrm.h | 0 .../frameworks/av/include/media/IDrmClient.h | 0 .../frameworks/av/include/media/IEffect.h | 0 .../av/include/media/IEffectClient.h | 0 .../frameworks/av/include/media/IHDCP.h | 0 .../av/include/media/IMediaDeathNotifier.h | 0 .../av/include/media/IMediaLogService.h | 0 .../include/media/IMediaMetadataRetriever.h | 0 .../av/include/media/IMediaPlayer.h | 0 .../av/include/media/IMediaPlayerClient.h | 0 .../av/include/media/IMediaPlayerService.h | 0 .../av/include/media/IMediaRecorder.h | 0 .../av/include/media/IMediaRecorderClient.h | 0 .../frameworks/av/include/media/IOMX.h | 0 .../av/include/media/IRemoteDisplay.h | 0 .../av/include/media/IRemoteDisplayClient.h | 0 .../av/include/media/IStreamSource.h | 0 .../frameworks/av/include/media/JetPlayer.h | 0 .../media/MediaMetadataRetrieverInterface.h | 0 .../av/include/media/MediaPlayerInterface.h | 0 .../av/include/media/MediaProfiles.h | 0 .../av/include/media/MediaRecorderBase.h | 0 .../av/include/media/MemoryLeakTrackUtil.h | 0 .../frameworks/av/include/media/Metadata.h | 0 .../av/include/media/SingleStateQueue.h | 0 .../frameworks/av/include/media/SoundPool.h | 0 .../av/include/media/ToneGenerator.h | 0 .../frameworks/av/include/media/Visualizer.h | 0 .../av/include/media/mediametadataretriever.h | 0 .../frameworks/av/include/media/mediaplayer.h | 0 .../av/include/media/mediarecorder.h | 0 .../av/include/media/mediascanner.h | 0 .../media/nbaio/AudioBufferProviderSource.h | 0 .../include/media/nbaio/AudioStreamInSource.h | 0 .../include/media/nbaio/AudioStreamOutSink.h | 0 .../av/include/media/nbaio/LibsndfileSink.h | 0 .../av/include/media/nbaio/LibsndfileSource.h | 0 .../av/include/media/nbaio/MonoPipe.h | 0 .../av/include/media/nbaio/MonoPipeReader.h | 0 .../frameworks/av/include/media/nbaio/NBAIO.h | 0 .../frameworks/av/include/media/nbaio/NBLog.h | 0 .../frameworks/av/include/media/nbaio/Pipe.h | 0 .../av/include/media/nbaio/PipeReader.h | 0 .../media/nbaio/SourceAudioBufferProvider.h | 0 .../av/include/media/nbaio/roundup.h | 0 .../av/include/media/stagefright/AACWriter.h | 0 .../av/include/media/stagefright/ACodec.h | 0 .../av/include/media/stagefright/AMRWriter.h | 0 .../include/media/stagefright/AudioPlayer.h | 0 .../include/media/stagefright/AudioSource.h | 0 .../media/stagefright/BufferProducerWrapper.h | 0 .../include/media/stagefright/CameraSource.h | 0 .../media/stagefright/CameraSourceTimeLapse.h | 0 .../media/stagefright/ColorConverter.h | 0 .../av/include/media/stagefright/DataSource.h | 0 .../av/include/media/stagefright/FileSource.h | 0 .../av/include/media/stagefright/JPEGSource.h | 0 .../include/media/stagefright/MPEG2TSWriter.h | 0 .../include/media/stagefright/MPEG4Writer.h | 0 .../include/media/stagefright/MediaAdapter.h | 0 .../include/media/stagefright/MediaBuffer.h | 0 .../media/stagefright/MediaBufferGroup.h | 0 .../av/include/media/stagefright/MediaCodec.h | 0 .../media/stagefright/MediaCodecList.h | 0 .../av/include/media/stagefright/MediaDefs.h | 0 .../include/media/stagefright/MediaErrors.h | 0 .../media/stagefright/MediaExtractor.h | 0 .../av/include/media/stagefright/MediaMuxer.h | 0 .../include/media/stagefright/MediaSource.h | 0 .../include/media/stagefright/MediaWriter.h | 0 .../av/include/media/stagefright/MetaData.h | 0 .../media/stagefright/NativeWindowWrapper.h | 0 .../media/stagefright/NuMediaExtractor.h | 0 .../av/include/media/stagefright/OMXClient.h | 0 .../av/include/media/stagefright/OMXCodec.h | 0 .../include/media/stagefright/SkipCutBuffer.h | 0 .../stagefright/StagefrightMediaScanner.h | 0 .../media/stagefright/SurfaceMediaSource.h | 0 .../av/include/media/stagefright/TimeSource.h | 0 .../av/include/media/stagefright/Utils.h | 0 .../av/include/media/stagefright/YUVCanvas.h | 0 .../av/include/media/stagefright/YUVImage.h | 0 .../media/stagefright/foundation/AAtomizer.h | 0 .../media/stagefright/foundation/ABase.h | 0 .../media/stagefright/foundation/ABitReader.h | 0 .../media/stagefright/foundation/ABuffer.h | 0 .../media/stagefright/foundation/ADebug.h | 0 .../media/stagefright/foundation/AHandler.h | 0 .../foundation/AHandlerReflector.h | 0 .../foundation/AHierarchicalStateMachine.h | 0 .../media/stagefright/foundation/ALooper.h | 0 .../stagefright/foundation/ALooperRoster.h | 0 .../media/stagefright/foundation/AMessage.h | 0 .../media/stagefright/foundation/AString.h | 0 .../media/stagefright/foundation/base64.h | 0 .../media/stagefright/foundation/hexdump.h | 0 .../stagefright/timedtext/TimedTextDriver.h | 0 .../native/include/binder/AppOpsManager.h | 0 .../frameworks/native/include/binder/Binder.h | 0 .../native/include/binder/BinderService.h | 0 .../native/include/binder/BpBinder.h | 0 .../native/include/binder/IAppOpsCallback.h | 0 .../native/include/binder/IAppOpsService.h | 0 .../native/include/binder/IBinder.h | 0 .../native/include/binder/IInterface.h | 0 .../native/include/binder/IMemory.h | 0 .../native/include/binder/IPCThreadState.h | 0 .../include/binder/IPermissionController.h | 0 .../native/include/binder/IServiceManager.h | 0 .../native/include/binder/MemoryBase.h | 0 .../native/include/binder/MemoryDealer.h | 0 .../native/include/binder/MemoryHeapBase.h | 0 .../frameworks/native/include/binder/Parcel.h | 0 .../native/include/binder/PermissionCache.h | 0 .../native/include/binder/ProcessState.h | 0 .../frameworks/native/include/gui/BitTube.h | 0 .../native/include/gui/BufferItemConsumer.h | 0 .../native/include/gui/BufferQueue.h | 0 .../native/include/gui/ConsumerBase.h | 0 .../native/include/gui/CpuConsumer.h | 0 .../native/include/gui/DisplayEventReceiver.h | 0 .../native/include/gui/DummyConsumer.h | 0 .../native/include/gui/GLConsumer.h | 0 .../native/include/gui/GraphicBufferAlloc.h | 0 .../frameworks/native/include/gui/GuiConfig.h | 0 .../include/gui/IDisplayEventConnection.h | 0 .../native/include/gui/IGraphicBufferAlloc.h | 0 .../include/gui/IGraphicBufferProducer.h | 0 .../include/gui/ISensorEventConnection.h | 0 .../native/include/gui/ISensorServer.h | 0 .../native/include/gui/ISurfaceComposer.h | 0 .../include/gui/ISurfaceComposerClient.h | 0 .../frameworks/native/include/gui/Sensor.h | 0 .../native/include/gui/SensorEventQueue.h | 0 .../native/include/gui/SensorManager.h | 0 .../frameworks/native/include/gui/Surface.h | 0 .../include/gui/SurfaceComposerClient.h | 0 .../native/include/gui/SurfaceControl.h | 0 .../native/include/media/drm/DrmAPI.h | 0 .../media/editor/II420ColorConverter.h | 0 .../native/include/media/hardware/CryptoAPI.h | 0 .../native/include/media/hardware/HDCPAPI.h | 0 .../include/media/hardware/HardwareAPI.h | 0 .../media/hardware/MetadataBufferType.h | 0 .../include/media/hardware/OMXPluginBase.h | 0 .../native/include/media/openmax/OMX_Audio.h | 0 .../include/media/openmax/OMX_Component.h | 0 .../include/media/openmax/OMX_ContentPipe.h | 0 .../native/include/media/openmax/OMX_Core.h | 0 .../include/media/openmax/OMX_IVCommon.h | 0 .../native/include/media/openmax/OMX_Image.h | 0 .../native/include/media/openmax/OMX_Index.h | 0 .../include/media/openmax/OMX_IndexExt.h | 0 .../native/include/media/openmax/OMX_Other.h | 0 .../native/include/media/openmax/OMX_Types.h | 0 .../native/include/media/openmax/OMX_Video.h | 0 .../include/media/openmax/OMX_VideoExt.h | 0 .../native/include/ui/ANativeObjectBase.h | 0 .../native/include/ui/DisplayInfo.h | 0 .../frameworks/native/include/ui/Fence.h | 0 .../include/ui/FramebufferNativeWindow.h | 0 .../native/include/ui/GraphicBuffer.h | 0 .../include/ui/GraphicBufferAllocator.h | 0 .../native/include/ui/GraphicBufferMapper.h | 0 .../native/include/ui/PixelFormat.h | 0 .../frameworks/native/include/ui/Point.h | 0 .../frameworks/native/include/ui/Rect.h | 0 .../frameworks/native/include/ui/Region.h | 0 .../frameworks/native/include/ui/UiConfig.h | 0 .../native/include/utils/AndroidThreads.h | 0 .../frameworks/native/include/utils/Atomic.h | 0 .../native/include/utils/BasicHashtable.h | 0 .../frameworks/native/include/utils/BitSet.h | 0 .../native/include/utils/BlobCache.h | 0 .../native/include/utils/BufferedTextOutput.h | 0 .../native/include/utils/ByteOrder.h | 0 .../native/include/utils/CallStack.h | 0 .../frameworks/native/include/utils/Compat.h | 0 .../native/include/utils/Condition.h | 0 .../frameworks/native/include/utils/Debug.h | 0 .../frameworks/native/include/utils/Endian.h | 0 .../frameworks/native/include/utils/Errors.h | 0 .../frameworks/native/include/utils/FileMap.h | 0 .../native/include/utils/Flattenable.h | 0 .../frameworks/native/include/utils/Functor.h | 0 .../native/include/utils/GenerationCache.h | 0 .../native/include/utils/JenkinsHash.h | 0 .../native/include/utils/KeyedVector.h | 0 .../native/include/utils/LinearAllocator.h | 0 .../native/include/utils/LinearTransform.h | 0 .../frameworks/native/include/utils/List.h | 0 .../frameworks/native/include/utils/Log.h | 0 .../frameworks/native/include/utils/Looper.h | 0 .../native/include/utils/LruCache.h | 0 .../frameworks/native/include/utils/Mutex.h | 0 .../native/include/utils/PropertyMap.h | 0 .../frameworks/native/include/utils/RWLock.h | 0 .../frameworks/native/include/utils/RefBase.h | 0 .../native/include/utils/SharedBuffer.h | 0 .../native/include/utils/Singleton.h | 0 .../native/include/utils/SortedVector.h | 0 .../native/include/utils/StopWatch.h | 0 .../native/include/utils/String16.h | 0 .../frameworks/native/include/utils/String8.h | 0 .../native/include/utils/StringArray.h | 0 .../native/include/utils/StrongPointer.h | 0 .../native/include/utils/SystemClock.h | 0 .../native/include/utils/TextOutput.h | 0 .../frameworks/native/include/utils/Thread.h | 0 .../native/include/utils/ThreadDefs.h | 0 .../frameworks/native/include/utils/Timers.h | 0 .../native/include/utils/Tokenizer.h | 0 .../frameworks/native/include/utils/Trace.h | 0 .../native/include/utils/TypeHelpers.h | 0 .../frameworks/native/include/utils/Unicode.h | 0 .../native/include/utils/UniquePtr.h | 0 .../frameworks/native/include/utils/Vector.h | 0 .../native/include/utils/VectorImpl.h | 0 .../native/include/utils/WorkQueue.h | 0 .../native/include/utils/ZipFileCRO.h | 0 .../native/include/utils/ZipFileRO.h | 0 .../native/include/utils/ZipUtils.h | 0 .../frameworks/native/include/utils/ashmem.h | 0 .../frameworks/native/include/utils/misc.h | 0 .../frameworks/native/include/utils/threads.h | 0 .../libhardware/include/hardware/audio.h | 0 .../include/hardware/audio_effect.h | 0 .../include/hardware/audio_policy.h | 0 .../libhardware/include/hardware/bluetooth.h | 0 .../libhardware/include/hardware/bt_av.h | 0 .../libhardware/include/hardware/bt_gatt.h | 0 .../include/hardware/bt_gatt_client.h | 0 .../include/hardware/bt_gatt_server.h | 0 .../include/hardware/bt_gatt_types.h | 0 .../libhardware/include/hardware/bt_hf.h | 0 .../libhardware/include/hardware/bt_hh.h | 0 .../libhardware/include/hardware/bt_hl.h | 0 .../libhardware/include/hardware/bt_pan.h | 0 .../libhardware/include/hardware/bt_rc.h | 0 .../libhardware/include/hardware/bt_sock.h | 0 .../libhardware/include/hardware/camera.h | 0 .../libhardware/include/hardware/camera2.h | 0 .../libhardware/include/hardware/camera3.h | 0 .../include/hardware/camera_common.h | 0 .../libhardware/include/hardware/fb.h | 0 .../libhardware/include/hardware/gps.h | 0 .../libhardware/include/hardware/gralloc.h | 0 .../libhardware/include/hardware/hardware.h | 0 .../libhardware/include/hardware/hwcomposer.h | 0 .../include/hardware/hwcomposer_defs.h | 0 .../libhardware/include/hardware/keymaster.h | 0 .../libhardware/include/hardware/lights.h | 0 .../include/hardware/local_time_hal.h | 0 .../libhardware/include/hardware/nfc.h | 0 .../libhardware/include/hardware/power.h | 0 .../libhardware/include/hardware/qemu_pipe.h | 0 .../libhardware/include/hardware/qemud.h | 0 .../libhardware/include/hardware/sensors.h | 0 .../system/core/include/cutils/abort_socket.h | 0 .../core/include/cutils/android_reboot.h | 0 .../system/core/include/cutils/aref.h | 0 .../system/core/include/cutils/array.h | 0 .../system/core/include/cutils/ashmem.h | 0 .../system/core/include/cutils/atomic-arm.h | 0 .../core/include/cutils/atomic-inline.h | 0 .../system/core/include/cutils/atomic-mips.h | 0 .../system/core/include/cutils/atomic-x86.h | 0 .../system/core/include/cutils/atomic.h | 0 .../system/core/include/cutils/bitops.h | 0 .../system/core/include/cutils/compiler.h | 0 .../system/core/include/cutils/config_utils.h | 0 .../system/core/include/cutils/cpu_info.h | 0 .../system/core/include/cutils/debugger.h | 0 .../system/core/include/cutils/dir_hash.h | 0 .../core/include/cutils/event_tag_map.h | 0 .../system/core/include/cutils/fs.h | 0 .../system/core/include/cutils/hashmap.h | 0 .../core/include/cutils/iosched_policy.h | 0 .../system/core/include/cutils/jstring.h | 0 .../system/core/include/cutils/klog.h | 0 .../system/core/include/cutils/list.h | 0 .../system/core/include/cutils/log.h | 0 .../system/core/include/cutils/logd.h | 0 .../system/core/include/cutils/logger.h | 0 .../system/core/include/cutils/logprint.h | 0 .../system/core/include/cutils/memory.h | 0 .../system/core/include/cutils/misc.h | 0 .../system/core/include/cutils/mq.h | 0 .../system/core/include/cutils/multiuser.h | 0 .../core/include/cutils/native_handle.h | 0 .../core/include/cutils/open_memstream.h | 0 .../core/include/cutils/partition_utils.h | 0 .../system/core/include/cutils/process_name.h | 0 .../system/core/include/cutils/properties.h | 0 .../core/include/cutils/qsort_r_compat.h | 0 .../system/core/include/cutils/qtaguid.h | 0 .../core/include/cutils/record_stream.h | 0 .../system/core/include/cutils/sched_policy.h | 0 .../system/core/include/cutils/selector.h | 0 .../system/core/include/cutils/sockets.h | 0 .../system/core/include/cutils/str_parms.h | 0 .../system/core/include/cutils/threads.h | 0 .../system/core/include/cutils/trace.h | 0 .../system/core/include/cutils/tztime.h | 0 .../system/core/include/cutils/uevent.h | 0 .../system/core/include/cutils/uio.h | 0 .../system/core/include/cutils/zygote.h | 0 .../system/core/include/sync/sw_sync.h | 0 .../system/core/include/sync/sync.h | 0 .../system/core/include/system/audio.h | 0 .../system/core/include/system/audio_policy.h | 0 .../system/core/include/system/camera.h | 0 .../system/core/include/system/graphics.h | 0 .../system/core/include/system/window.h | 0 .../av/include/media/AudioBufferProvider.h | 0 .../frameworks/av/include/media/AudioEffect.h | 0 .../av/include/media/AudioParameter.h | 0 .../frameworks/av/include/media/AudioRecord.h | 0 .../frameworks/av/include/media/AudioSystem.h | 0 .../av/include/media/AudioTimestamp.h | 0 .../frameworks/av/include/media/AudioTrack.h | 0 .../av/include/media/EffectsFactoryApi.h | 0 .../media/ExtendedAudioBufferProvider.h | 0 .../av/include/media/IAudioFlinger.h | 0 .../av/include/media/IAudioFlingerClient.h | 0 .../av/include/media/IAudioPolicyService.h | 0 .../av/include/media/IAudioRecord.h | 0 .../frameworks/av/include/media/IAudioTrack.h | 0 .../frameworks/av/include/media/ICrypto.h | 0 .../frameworks/av/include/media/IDrm.h | 0 .../frameworks/av/include/media/IDrmClient.h | 0 .../frameworks/av/include/media/IEffect.h | 0 .../av/include/media/IEffectClient.h | 0 .../frameworks/av/include/media/IHDCP.h | 0 .../av/include/media/IMediaDeathNotifier.h | 0 .../av/include/media/IMediaLogService.h | 0 .../include/media/IMediaMetadataRetriever.h | 0 .../av/include/media/IMediaPlayer.h | 0 .../av/include/media/IMediaPlayerClient.h | 0 .../av/include/media/IMediaPlayerService.h | 0 .../av/include/media/IMediaRecorder.h | 0 .../av/include/media/IMediaRecorderClient.h | 0 .../frameworks/av/include/media/IOMX.h | 0 .../av/include/media/IRemoteDisplay.h | 0 .../av/include/media/IRemoteDisplayClient.h | 0 .../av/include/media/IStreamSource.h | 0 .../frameworks/av/include/media/JetPlayer.h | 0 .../media/MediaMetadataRetrieverInterface.h | 0 .../av/include/media/MediaPlayerInterface.h | 0 .../av/include/media/MediaProfiles.h | 0 .../av/include/media/MediaRecorderBase.h | 0 .../av/include/media/MemoryLeakTrackUtil.h | 0 .../frameworks/av/include/media/Metadata.h | 0 .../av/include/media/SingleStateQueue.h | 0 .../frameworks/av/include/media/SoundPool.h | 0 .../av/include/media/ToneGenerator.h | 0 .../frameworks/av/include/media/Visualizer.h | 0 .../av/include/media/mediametadataretriever.h | 0 .../frameworks/av/include/media/mediaplayer.h | 0 .../av/include/media/mediarecorder.h | 0 .../av/include/media/mediascanner.h | 0 .../media/nbaio/AudioBufferProviderSource.h | 0 .../include/media/nbaio/AudioStreamInSource.h | 0 .../include/media/nbaio/AudioStreamOutSink.h | 0 .../av/include/media/nbaio/LibsndfileSink.h | 0 .../av/include/media/nbaio/LibsndfileSource.h | 0 .../av/include/media/nbaio/MonoPipe.h | 0 .../av/include/media/nbaio/MonoPipeReader.h | 0 .../frameworks/av/include/media/nbaio/NBAIO.h | 0 .../frameworks/av/include/media/nbaio/NBLog.h | 0 .../frameworks/av/include/media/nbaio/Pipe.h | 0 .../av/include/media/nbaio/PipeReader.h | 0 .../media/nbaio/SourceAudioBufferProvider.h | 0 .../av/include/media/nbaio/roundup.h | 0 .../av/include/media/stagefright/AACWriter.h | 0 .../av/include/media/stagefright/ACodec.h | 0 .../av/include/media/stagefright/AMRWriter.h | 0 .../include/media/stagefright/AudioPlayer.h | 0 .../include/media/stagefright/AudioSource.h | 0 .../media/stagefright/BufferProducerWrapper.h | 0 .../include/media/stagefright/CameraSource.h | 0 .../media/stagefright/CameraSourceTimeLapse.h | 0 .../media/stagefright/ColorConverter.h | 0 .../av/include/media/stagefright/DataSource.h | 0 .../av/include/media/stagefright/FileSource.h | 0 .../av/include/media/stagefright/JPEGSource.h | 0 .../include/media/stagefright/MPEG2TSWriter.h | 0 .../include/media/stagefright/MPEG4Writer.h | 0 .../include/media/stagefright/MediaAdapter.h | 0 .../include/media/stagefright/MediaBuffer.h | 0 .../media/stagefright/MediaBufferGroup.h | 0 .../av/include/media/stagefright/MediaCodec.h | 0 .../media/stagefright/MediaCodecList.h | 0 .../av/include/media/stagefright/MediaDefs.h | 0 .../include/media/stagefright/MediaErrors.h | 0 .../media/stagefright/MediaExtractor.h | 0 .../av/include/media/stagefright/MediaMuxer.h | 0 .../include/media/stagefright/MediaSource.h | 0 .../include/media/stagefright/MediaWriter.h | 0 .../av/include/media/stagefright/MetaData.h | 0 .../media/stagefright/NativeWindowWrapper.h | 0 .../media/stagefright/NuMediaExtractor.h | 0 .../av/include/media/stagefright/OMXClient.h | 0 .../av/include/media/stagefright/OMXCodec.h | 0 .../include/media/stagefright/SkipCutBuffer.h | 0 .../stagefright/StagefrightMediaScanner.h | 0 .../media/stagefright/SurfaceMediaSource.h | 0 .../av/include/media/stagefright/TimeSource.h | 0 .../av/include/media/stagefright/Utils.h | 0 .../av/include/media/stagefright/YUVCanvas.h | 0 .../av/include/media/stagefright/YUVImage.h | 0 .../media/stagefright/foundation/AAtomizer.h | 0 .../media/stagefright/foundation/ABase.h | 0 .../media/stagefright/foundation/ABitReader.h | 0 .../media/stagefright/foundation/ABuffer.h | 0 .../media/stagefright/foundation/ADebug.h | 0 .../media/stagefright/foundation/AHandler.h | 0 .../foundation/AHandlerReflector.h | 0 .../foundation/AHierarchicalStateMachine.h | 0 .../media/stagefright/foundation/ALooper.h | 0 .../stagefright/foundation/ALooperRoster.h | 0 .../media/stagefright/foundation/AMessage.h | 0 .../stagefright/foundation/ANetworkSession.h | 0 .../media/stagefright/foundation/AString.h | 0 .../stagefright/foundation/ParsedMessage.h | 0 .../media/stagefright/foundation/base64.h | 0 .../media/stagefright/foundation/hexdump.h | 0 .../stagefright/timedtext/TimedTextDriver.h | 0 .../native/include/binder/AppOpsManager.h | 0 .../frameworks/native/include/binder/Binder.h | 0 .../native/include/binder/BinderService.h | 0 .../native/include/binder/BpBinder.h | 0 .../include/binder/BufferedTextOutput.h | 0 .../frameworks/native/include/binder/Debug.h | 0 .../native/include/binder/IAppOpsCallback.h | 0 .../native/include/binder/IAppOpsService.h | 0 .../native/include/binder/IBinder.h | 0 .../native/include/binder/IInterface.h | 0 .../native/include/binder/IMemory.h | 0 .../native/include/binder/IPCThreadState.h | 0 .../include/binder/IPermissionController.h | 0 .../native/include/binder/IServiceManager.h | 0 .../native/include/binder/MemoryBase.h | 0 .../native/include/binder/MemoryDealer.h | 0 .../native/include/binder/MemoryHeapBase.h | 0 .../frameworks/native/include/binder/Parcel.h | 0 .../native/include/binder/PermissionCache.h | 0 .../native/include/binder/ProcessState.h | 0 .../native/include/binder/TextOutput.h | 0 .../frameworks/native/include/gui/BitTube.h | 0 .../native/include/gui/BufferItemConsumer.h | 0 .../native/include/gui/BufferQueue.h | 0 .../native/include/gui/ConsumerBase.h | 0 .../native/include/gui/CpuConsumer.h | 0 .../native/include/gui/DisplayEventReceiver.h | 0 .../native/include/gui/GLConsumer.h | 0 .../native/include/gui/GraphicBufferAlloc.h | 0 .../frameworks/native/include/gui/GuiConfig.h | 0 .../native/include/gui/IConsumerListener.h | 0 .../include/gui/IDisplayEventConnection.h | 0 .../native/include/gui/IGraphicBufferAlloc.h | 0 .../include/gui/IGraphicBufferConsumer.h | 0 .../include/gui/IGraphicBufferProducer.h | 0 .../include/gui/ISensorEventConnection.h | 0 .../native/include/gui/ISensorServer.h | 0 .../native/include/gui/ISurfaceComposer.h | 0 .../include/gui/ISurfaceComposerClient.h | 0 .../frameworks/native/include/gui/Sensor.h | 0 .../native/include/gui/SensorEventQueue.h | 0 .../native/include/gui/SensorManager.h | 0 .../frameworks/native/include/gui/Surface.h | 0 .../include/gui/SurfaceComposerClient.h | 0 .../native/include/gui/SurfaceControl.h | 0 .../native/include/media/drm/DrmAPI.h | 0 .../media/editor/II420ColorConverter.h | 0 .../native/include/media/hardware/CryptoAPI.h | 0 .../native/include/media/hardware/HDCPAPI.h | 0 .../include/media/hardware/HardwareAPI.h | 0 .../media/hardware/MetadataBufferType.h | 0 .../include/media/hardware/OMXPluginBase.h | 0 .../native/include/media/openmax/OMX_Audio.h | 0 .../include/media/openmax/OMX_Component.h | 0 .../include/media/openmax/OMX_ContentPipe.h | 0 .../native/include/media/openmax/OMX_Core.h | 0 .../include/media/openmax/OMX_IVCommon.h | 0 .../native/include/media/openmax/OMX_Image.h | 0 .../native/include/media/openmax/OMX_Index.h | 0 .../include/media/openmax/OMX_IndexExt.h | 0 .../native/include/media/openmax/OMX_Other.h | 0 .../native/include/media/openmax/OMX_Types.h | 0 .../native/include/media/openmax/OMX_Video.h | 0 .../include/media/openmax/OMX_VideoExt.h | 0 .../native/include/ui/ANativeObjectBase.h | 0 .../native/include/ui/DisplayInfo.h | 0 .../frameworks/native/include/ui/Fence.h | 0 .../include/ui/FramebufferNativeWindow.h | 0 .../native/include/ui/GraphicBuffer.h | 0 .../include/ui/GraphicBufferAllocator.h | 0 .../native/include/ui/GraphicBufferMapper.h | 0 .../native/include/ui/PixelFormat.h | 0 .../frameworks/native/include/ui/Point.h | 0 .../frameworks/native/include/ui/Rect.h | 0 .../frameworks/native/include/ui/Region.h | 0 .../native/include/ui/TMatHelpers.h | 0 .../native/include/ui/TVecHelpers.h | 0 .../frameworks/native/include/ui/UiConfig.h | 0 .../frameworks/native/include/ui/mat4.h | 0 .../frameworks/native/include/ui/vec2.h | 0 .../frameworks/native/include/ui/vec3.h | 0 .../frameworks/native/include/ui/vec4.h | 0 .../libhardware/include/hardware/audio.h | 0 .../include/hardware/audio_effect.h | 0 .../include/hardware/audio_policy.h | 0 .../libhardware/include/hardware/bluetooth.h | 0 .../libhardware/include/hardware/bt_av.h | 0 .../libhardware/include/hardware/bt_gatt.h | 0 .../include/hardware/bt_gatt_client.h | 0 .../include/hardware/bt_gatt_server.h | 0 .../include/hardware/bt_gatt_types.h | 0 .../libhardware/include/hardware/bt_hf.h | 0 .../libhardware/include/hardware/bt_hh.h | 0 .../libhardware/include/hardware/bt_hl.h | 0 .../libhardware/include/hardware/bt_pan.h | 0 .../libhardware/include/hardware/bt_rc.h | 0 .../libhardware/include/hardware/bt_sock.h | 0 .../libhardware/include/hardware/camera.h | 0 .../libhardware/include/hardware/camera2.h | 0 .../libhardware/include/hardware/camera3.h | 0 .../include/hardware/camera_common.h | 0 .../libhardware/include/hardware/consumerir.h | 0 .../libhardware/include/hardware/fb.h | 0 .../include/hardware/fused_location.h | 0 .../libhardware/include/hardware/gps.h | 0 .../libhardware/include/hardware/gralloc.h | 0 .../libhardware/include/hardware/hardware.h | 0 .../libhardware/include/hardware/hwcomposer.h | 0 .../include/hardware/hwcomposer_defs.h | 0 .../libhardware/include/hardware/keymaster.h | 0 .../libhardware/include/hardware/lights.h | 0 .../include/hardware/local_time_hal.h | 0 .../libhardware/include/hardware/memtrack.h | 0 .../libhardware/include/hardware/nfc.h | 0 .../libhardware/include/hardware/power.h | 0 .../libhardware/include/hardware/qemu_pipe.h | 0 .../libhardware/include/hardware/qemud.h | 0 .../libhardware/include/hardware/sensors.h | 0 .../core/include/cutils/android_reboot.h | 0 .../system/core/include/cutils/aref.h | 0 .../system/core/include/cutils/ashmem.h | 0 .../system/core/include/cutils/atomic-arm.h | 0 .../core/include/cutils/atomic-inline.h | 0 .../system/core/include/cutils/atomic-mips.h | 0 .../system/core/include/cutils/atomic-x86.h | 0 .../system/core/include/cutils/atomic.h | 0 .../system/core/include/cutils/bitops.h | 0 .../system/core/include/cutils/compiler.h | 0 .../system/core/include/cutils/config_utils.h | 0 .../system/core/include/cutils/cpu_info.h | 0 .../system/core/include/cutils/debugger.h | 0 .../system/core/include/cutils/dir_hash.h | 0 .../system/core/include/cutils/fs.h | 0 .../system/core/include/cutils/hashmap.h | 0 .../core/include/cutils/iosched_policy.h | 0 .../system/core/include/cutils/jstring.h | 0 .../system/core/include/cutils/klog.h | 0 .../system/core/include/cutils/list.h | 0 .../system/core/include/cutils/log.h | 0 .../system/core/include/cutils/memory.h | 0 .../system/core/include/cutils/misc.h | 0 .../system/core/include/cutils/multiuser.h | 0 .../core/include/cutils/native_handle.h | 0 .../core/include/cutils/open_memstream.h | 0 .../core/include/cutils/partition_utils.h | 0 .../system/core/include/cutils/process_name.h | 0 .../system/core/include/cutils/properties.h | 0 .../system/core/include/cutils/qtaguid.h | 0 .../core/include/cutils/record_stream.h | 0 .../system/core/include/cutils/sched_policy.h | 0 .../system/core/include/cutils/sockets.h | 0 .../system/core/include/cutils/str_parms.h | 0 .../system/core/include/cutils/threads.h | 0 .../system/core/include/cutils/trace.h | 0 .../system/core/include/cutils/tztime.h | 0 .../system/core/include/cutils/uevent.h | 0 .../system/core/include/log/event_tag_map.h | 0 .../system/core/include/log/log.h | 0 .../system/core/include/log/logd.h | 0 .../system/core/include/log/logger.h | 0 .../system/core/include/log/logprint.h | 0 .../system/core/include/log/uio.h | 0 .../system/core/include/sync/sw_sync.h | 0 .../system/core/include/sync/sync.h | 0 .../system/core/include/system/audio.h | 0 .../system/core/include/system/audio_policy.h | 0 .../system/core/include/system/camera.h | 0 .../system/core/include/system/graphics.h | 0 .../system/core/include/system/thread_defs.h | 0 .../system/core/include/system/window.h | 0 .../core/include/utils/AndroidThreads.h | 0 .../system/core/include/utils/Atomic.h | 0 .../core/include/utils/BasicHashtable.h | 0 .../system/core/include/utils/BitSet.h | 0 .../system/core/include/utils/BlobCache.h | 0 .../system/core/include/utils/ByteOrder.h | 0 .../system/core/include/utils/CallStack.h | 0 .../system/core/include/utils/Compat.h | 0 .../system/core/include/utils/Condition.h | 0 .../system/core/include/utils/Debug.h | 0 .../system/core/include/utils/Endian.h | 0 .../system/core/include/utils/Errors.h | 0 .../system/core/include/utils/FileMap.h | 0 .../system/core/include/utils/Flattenable.h | 0 .../system/core/include/utils/Functor.h | 0 .../system/core/include/utils/JenkinsHash.h | 0 .../system/core/include/utils/KeyedVector.h | 0 .../core/include/utils/LinearAllocator.h | 0 .../core/include/utils/LinearTransform.h | 0 .../system/core/include/utils/List.h | 0 .../system/core/include/utils/Log.h | 0 .../system/core/include/utils/Looper.h | 0 .../system/core/include/utils/LruCache.h | 0 .../system/core/include/utils/Mutex.h | 0 .../system/core/include/utils/PropertyMap.h | 0 .../system/core/include/utils/RWLock.h | 0 .../system/core/include/utils/RefBase.h | 0 .../system/core/include/utils/SharedBuffer.h | 0 .../system/core/include/utils/Singleton.h | 0 .../system/core/include/utils/SortedVector.h | 0 .../system/core/include/utils/StopWatch.h | 0 .../system/core/include/utils/String16.h | 0 .../system/core/include/utils/String8.h | 0 .../system/core/include/utils/StrongPointer.h | 0 .../system/core/include/utils/SystemClock.h | 0 .../system/core/include/utils/Thread.h | 0 .../system/core/include/utils/ThreadDefs.h | 0 .../system/core/include/utils/Timers.h | 0 .../system/core/include/utils/Tokenizer.h | 0 .../system/core/include/utils/Trace.h | 0 .../system/core/include/utils/TypeHelpers.h | 0 .../system/core/include/utils/Unicode.h | 0 .../system/core/include/utils/UniquePtr.h | 0 .../system/core/include/utils/Vector.h | 0 .../system/core/include/utils/VectorImpl.h | 0 .../system/core/include/utils/ashmem.h | 0 .../system/core/include/utils/misc.h | 0 .../system/core/include/utils/threads.h | 0 compile.sh | 14 +------ libvlc/jni/Android.mk | 38 +++++++++---------- 1664 files changed, 21 insertions(+), 31 deletions(-) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/android_runtime/ActivityManager.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/android_runtime/AndroidRuntime.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/android_runtime/android_app_NativeActivity.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/android_runtime/android_content_res_Configuration.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/android_runtime/android_util_AssetManager.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/android_runtime/android_view_Surface.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/binder/Binder.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/binder/BinderService.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/binder/BpBinder.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/binder/IBinder.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/binder/IInterface.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/binder/IMemory.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/binder/IPCThreadState.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/binder/IPermissionController.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/binder/IServiceManager.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/binder/MemoryBase.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/binder/MemoryDealer.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/binder/MemoryHeapBase.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/binder/MemoryHeapPmem.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/binder/Parcel.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/binder/Permission.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/binder/ProcessState.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/camera/Camera.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/camera/CameraHardwareInterface.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/camera/CameraParameters.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/camera/ICamera.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/camera/ICameraClient.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/camera/ICameraService.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/gui/ISensorEventConnection.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/gui/ISensorServer.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/gui/Sensor.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/gui/SensorChannel.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/gui/SensorEventQueue.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/gui/SensorManager.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/media/AudioEffect.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/media/AudioRecord.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/media/AudioSystem.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/media/AudioTrack.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/media/EffectApi.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/media/EffectBassBoostApi.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/media/EffectEnvironmentalReverbApi.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/media/EffectEqualizerApi.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/media/EffectPresetReverbApi.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/media/EffectVirtualizerApi.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/media/EffectVisualizerApi.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/media/EffectsFactoryApi.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/media/IAudioFlinger.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/media/IAudioFlingerClient.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/media/IAudioPolicyService.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/media/IAudioRecord.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/media/IAudioTrack.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/media/IEffect.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/media/IEffectClient.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/media/IMediaDeathNotifier.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/media/IMediaMetadataRetriever.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/media/IMediaPlayer.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/media/IMediaPlayerClient.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/media/IMediaPlayerService.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/media/IMediaRecorder.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/media/IMediaRecorderClient.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/media/IOMX.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/media/JetPlayer.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/media/MediaMetadataRetrieverInterface.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/media/MediaPlayerInterface.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/media/MediaProfiles.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/media/MediaRecorderBase.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/media/Metadata.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/media/OverlayRenderer.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/media/PVMediaRecorder.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/media/PVMetadataRetriever.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/media/PVPlayer.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/media/ToneGenerator.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/media/Visualizer.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/media/mediametadataretriever.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/media/mediaplayer.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/media/mediarecorder.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/media/mediascanner.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/media/stagefright/AMRWriter.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/media/stagefright/AudioPlayer.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/media/stagefright/AudioSource.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/media/stagefright/CameraSource.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/media/stagefright/ColorConverter.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/media/stagefright/DataSource.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/media/stagefright/FileSource.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/media/stagefright/HardwareAPI.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/media/stagefright/JPEGSource.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/media/stagefright/MPEG2TSWriter.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/media/stagefright/MPEG4Writer.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/media/stagefright/MediaBuffer.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/media/stagefright/MediaBufferGroup.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/media/stagefright/MediaDebug.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/media/stagefright/MediaDefs.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/media/stagefright/MediaErrors.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/media/stagefright/MediaExtractor.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/media/stagefright/MediaSource.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/media/stagefright/MediaWriter.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/media/stagefright/MetaData.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/media/stagefright/OMXClient.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/media/stagefright/OMXCodec.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/media/stagefright/OMXPluginBase.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/media/stagefright/ShoutcastSource.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/media/stagefright/StagefrightMediaScanner.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/media/stagefright/TimeSource.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/media/stagefright/Utils.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/media/stagefright/VideoRenderer.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/media/stagefright/foundation/AAtomizer.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/media/stagefright/foundation/ABase.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/media/stagefright/foundation/ABitReader.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/media/stagefright/foundation/ABuffer.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/media/stagefright/foundation/ADebug.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/media/stagefright/foundation/AHandler.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/media/stagefright/foundation/AHandlerReflector.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/media/stagefright/foundation/ALooper.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/media/stagefright/foundation/ALooperRoster.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/media/stagefright/foundation/AMessage.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/media/stagefright/foundation/AString.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/media/stagefright/foundation/base64.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/media/stagefright/foundation/hexdump.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/media/stagefright/openmax/OMX_Audio.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/media/stagefright/openmax/OMX_Component.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/media/stagefright/openmax/OMX_ContentPipe.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/media/stagefright/openmax/OMX_Core.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/media/stagefright/openmax/OMX_IVCommon.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/media/stagefright/openmax/OMX_Image.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/media/stagefright/openmax/OMX_Index.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/media/stagefright/openmax/OMX_Other.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/media/stagefright/openmax/OMX_Types.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/media/stagefright/openmax/OMX_Video.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/media/thread_init.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/pim/EventRecurrence.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/private/README (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/private/binder/Static.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/private/binder/binder_module.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/private/media/AudioEffectShared.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/private/media/AudioTrackShared.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/private/media/VideoFrame.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/private/opengles/gl_context.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/private/surfaceflinger/LayerState.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/private/surfaceflinger/SharedBufferStack.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/private/ui/RegionHelper.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/private/ui/android_natives_priv.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/private/ui/sw_gralloc_handle.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/private/utils/Static.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/storage/IMountService.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/storage/IMountServiceListener.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/storage/IMountShutdownObserver.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/storage/IObbActionListener.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/surfaceflinger/ISurface.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/surfaceflinger/ISurfaceComposer.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/surfaceflinger/ISurfaceComposerClient.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/surfaceflinger/Surface.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/surfaceflinger/SurfaceComposerClient.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/tts/TtsEngine.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/ui/DisplayInfo.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/ui/EGLNativeSurface.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/ui/EGLUtils.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/ui/EventHub.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/ui/FramebufferNativeWindow.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/ui/GraphicBuffer.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/ui/GraphicBufferAllocator.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/ui/GraphicBufferMapper.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/ui/GraphicLog.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/ui/IOverlay.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/ui/Input.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/ui/InputDispatcher.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/ui/InputManager.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/ui/InputReader.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/ui/InputTransport.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/ui/KeyCharacterMap.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/ui/KeycodeLabels.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/ui/Overlay.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/ui/PixelFormat.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/ui/Point.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/ui/PowerManager.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/ui/Rect.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/ui/Region.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/ui/android_native_buffer.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/ui/egl/android_natives.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/utils/Asset.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/utils/AssetDir.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/utils/AssetManager.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/utils/Atomic.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/utils/BackupHelpers.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/utils/BitSet.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/utils/BufferedTextOutput.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/utils/ByteOrder.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/utils/CallStack.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/utils/Debug.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/utils/Endian.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/utils/Errors.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/utils/FileMap.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/utils/Flattenable.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/utils/KeyedVector.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/utils/List.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/utils/Log.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/utils/Looper.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/utils/ObbFile.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/utils/PackageRedirectionMap.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/utils/Pool.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/utils/RefBase.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/utils/ResourceTypes.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/utils/SharedBuffer.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/utils/Singleton.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/utils/SortedVector.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/utils/StopWatch.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/utils/StreamingZipInflater.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/utils/String16.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/utils/String8.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/utils/StringArray.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/utils/SystemClock.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/utils/TextOutput.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/utils/Timers.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/utils/TypeHelpers.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/utils/Vector.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/utils/VectorImpl.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/utils/ZipEntry.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/utils/ZipFile.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/utils/ZipFileCRO.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/utils/ZipFileRO.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/utils/ZipUtils.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/utils/ashmem.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/utils/misc.h (100%) rename android-headers/{android-headers-gingerbread => 10}/frameworks/base/include/utils/threads.h (100%) rename android-headers/{android-headers-gingerbread => 10}/hardware/libhardware/include/hardware/copybit.h (100%) rename android-headers/{android-headers-gingerbread => 10}/hardware/libhardware/include/hardware/gps.h (100%) rename android-headers/{android-headers-gingerbread => 10}/hardware/libhardware/include/hardware/gralloc.h (100%) rename android-headers/{android-headers-gingerbread => 10}/hardware/libhardware/include/hardware/hardware.h (100%) rename android-headers/{android-headers-gingerbread => 10}/hardware/libhardware/include/hardware/lights.h (100%) rename android-headers/{android-headers-gingerbread => 10}/hardware/libhardware/include/hardware/overlay.h (100%) rename android-headers/{android-headers-gingerbread => 10}/hardware/libhardware/include/hardware/qemud.h (100%) rename android-headers/{android-headers-gingerbread => 10}/hardware/libhardware/include/hardware/sensors.h (100%) rename android-headers/{android-headers-gingerbread => 10}/hardware/libhardware/include/hardware/sensors_deprecated.h (100%) rename android-headers/{android-headers-gingerbread => 10}/system/core/include/acc/acc.h (100%) rename android-headers/{android-headers-gingerbread => 10}/system/core/include/android/log.h (100%) rename android-headers/{android-headers-gingerbread => 10}/system/core/include/arch/darwin-x86/AndroidConfig.h (100%) rename android-headers/{android-headers-gingerbread => 10}/system/core/include/arch/freebsd-x86/AndroidConfig.h (100%) rename android-headers/{android-headers-gingerbread => 10}/system/core/include/arch/linux-arm/AndroidConfig.h (100%) rename android-headers/{android-headers-gingerbread => 10}/system/core/include/arch/linux-sh/AndroidConfig.h (100%) rename android-headers/{android-headers-gingerbread => 10}/system/core/include/arch/linux-x86/AndroidConfig.h (100%) rename android-headers/{android-headers-gingerbread => 10}/system/core/include/arch/target_linux-x86/AndroidConfig.h (100%) rename android-headers/{android-headers-gingerbread => 10}/system/core/include/arch/windows/AndroidConfig.h (100%) rename android-headers/{android-headers-gingerbread => 10}/system/core/include/ctest/ctest.h (100%) rename android-headers/{android-headers-gingerbread => 10}/system/core/include/cutils/abort_socket.h (100%) rename android-headers/{android-headers-gingerbread => 10}/system/core/include/cutils/array.h (100%) rename android-headers/{android-headers-gingerbread => 10}/system/core/include/cutils/ashmem.h (100%) rename android-headers/{android-headers-gingerbread => 10}/system/core/include/cutils/atomic-arm.h (100%) rename android-headers/{android-headers-gingerbread => 10}/system/core/include/cutils/atomic-inline.h (100%) rename android-headers/{android-headers-gingerbread => 10}/system/core/include/cutils/atomic-x86.h (100%) rename android-headers/{android-headers-gingerbread => 10}/system/core/include/cutils/atomic.h (100%) rename android-headers/{android-headers-gingerbread => 10}/system/core/include/cutils/compiler.h (100%) rename android-headers/{android-headers-gingerbread => 10}/system/core/include/cutils/config_utils.h (100%) rename android-headers/{android-headers-gingerbread => 10}/system/core/include/cutils/cpu_info.h (100%) rename android-headers/{android-headers-gingerbread => 10}/system/core/include/cutils/dir_hash.h (100%) rename android-headers/{android-headers-gingerbread => 10}/system/core/include/cutils/event_tag_map.h (100%) rename android-headers/{android-headers-gingerbread => 10}/system/core/include/cutils/hashmap.h (100%) rename android-headers/{android-headers-gingerbread => 10}/system/core/include/cutils/iosched_policy.h (100%) rename android-headers/{android-headers-gingerbread => 10}/system/core/include/cutils/jstring.h (100%) rename android-headers/{android-headers-gingerbread => 10}/system/core/include/cutils/log.h (100%) rename android-headers/{android-headers-gingerbread => 10}/system/core/include/cutils/logd.h (100%) rename android-headers/{android-headers-gingerbread => 10}/system/core/include/cutils/logger.h (100%) rename android-headers/{android-headers-gingerbread => 10}/system/core/include/cutils/logprint.h (100%) rename android-headers/{android-headers-gingerbread => 10}/system/core/include/cutils/memory.h (100%) rename android-headers/{android-headers-gingerbread => 10}/system/core/include/cutils/misc.h (100%) rename android-headers/{android-headers-gingerbread => 10}/system/core/include/cutils/mq.h (100%) rename android-headers/{android-headers-gingerbread => 10}/system/core/include/cutils/mspace.h (100%) rename android-headers/{android-headers-gingerbread => 10}/system/core/include/cutils/native_handle.h (100%) rename android-headers/{android-headers-gingerbread => 10}/system/core/include/cutils/open_memstream.h (100%) rename android-headers/{android-headers-gingerbread => 10}/system/core/include/cutils/process_name.h (100%) rename android-headers/{android-headers-gingerbread => 10}/system/core/include/cutils/properties.h (100%) rename android-headers/{android-headers-gingerbread => 10}/system/core/include/cutils/record_stream.h (100%) rename android-headers/{android-headers-gingerbread => 10}/system/core/include/cutils/sched_policy.h (100%) rename android-headers/{android-headers-gingerbread => 10}/system/core/include/cutils/selector.h (100%) rename android-headers/{android-headers-gingerbread => 10}/system/core/include/cutils/sockets.h (100%) rename android-headers/{android-headers-gingerbread => 10}/system/core/include/cutils/threads.h (100%) rename android-headers/{android-headers-gingerbread => 10}/system/core/include/cutils/tztime.h (100%) rename android-headers/{android-headers-gingerbread => 10}/system/core/include/cutils/uio.h (100%) rename android-headers/{android-headers-gingerbread => 10}/system/core/include/cutils/zygote.h (100%) rename android-headers/{android-headers-gingerbread => 10}/system/core/include/diskconfig/diskconfig.h (100%) rename android-headers/{android-headers-gingerbread => 10}/system/core/include/mincrypt/rsa.h (100%) rename android-headers/{android-headers-gingerbread => 10}/system/core/include/mincrypt/sha.h (100%) rename android-headers/{android-headers-gingerbread => 10}/system/core/include/pixelflinger/format.h (100%) rename android-headers/{android-headers-gingerbread => 10}/system/core/include/pixelflinger/pixelflinger.h (100%) rename android-headers/{android-headers-gingerbread => 10}/system/core/include/private/android_filesystem_config.h (100%) rename android-headers/{android-headers-gingerbread => 10}/system/core/include/private/pixelflinger/ggl_context.h (100%) rename android-headers/{android-headers-gingerbread => 10}/system/core/include/private/pixelflinger/ggl_fixed.h (100%) rename android-headers/{android-headers-gingerbread => 10}/system/core/include/reboot/reboot.h (100%) rename android-headers/{android-headers-gingerbread => 10}/system/core/include/sysutils/FrameworkClient.h (100%) rename android-headers/{android-headers-gingerbread => 10}/system/core/include/sysutils/FrameworkCommand.h (100%) rename android-headers/{android-headers-gingerbread => 10}/system/core/include/sysutils/FrameworkListener.h (100%) rename android-headers/{android-headers-gingerbread => 10}/system/core/include/sysutils/NetlinkEvent.h (100%) rename android-headers/{android-headers-gingerbread => 10}/system/core/include/sysutils/NetlinkListener.h (100%) rename android-headers/{android-headers-gingerbread => 10}/system/core/include/sysutils/ServiceManager.h (100%) rename android-headers/{android-headers-gingerbread => 10}/system/core/include/sysutils/SocketClient.h (100%) rename android-headers/{android-headers-gingerbread => 10}/system/core/include/sysutils/SocketListener.h (100%) rename android-headers/{android-headers-gingerbread => 10}/system/core/include/zipfile/zipfile.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/android_runtime/ActivityManager.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/android_runtime/AndroidRuntime.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/android_runtime/android_app_NativeActivity.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/android_runtime/android_content_res_Configuration.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/android_runtime/android_graphics_SurfaceTexture.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/android_runtime/android_util_AssetManager.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/android_runtime/android_view_Surface.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/binder/Binder.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/binder/BinderService.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/binder/BpBinder.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/binder/CursorWindow.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/binder/IBinder.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/binder/IInterface.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/binder/IMemory.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/binder/IPCThreadState.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/binder/IPermissionController.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/binder/IServiceManager.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/binder/MemoryBase.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/binder/MemoryDealer.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/binder/MemoryHeapBase.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/binder/MemoryHeapPmem.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/binder/Parcel.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/binder/Permission.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/binder/ProcessState.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/camera/Camera.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/camera/CameraHardwareInterface.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/camera/CameraParameters.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/camera/ICamera.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/camera/ICameraClient.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/camera/ICameraService.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/diskusage/dirsize.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/drm/DrmConstraints.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/drm/DrmConvertedStatus.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/drm/DrmInfo.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/drm/DrmInfoEvent.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/drm/DrmInfoRequest.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/drm/DrmInfoStatus.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/drm/DrmManagerClient.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/drm/DrmMetadata.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/drm/DrmRights.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/drm/DrmSupportInfo.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/drm/drm_framework_common.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/gui/ISensorEventConnection.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/gui/ISensorServer.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/gui/ISurfaceTexture.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/gui/Sensor.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/gui/SensorChannel.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/gui/SensorEventQueue.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/gui/SensorManager.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/gui/SurfaceTexture.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/gui/SurfaceTextureClient.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/media/AudioEffect.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/media/AudioRecord.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/media/AudioSystem.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/media/AudioTrack.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/media/EffectApi.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/media/EffectBassBoostApi.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/media/EffectEnvironmentalReverbApi.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/media/EffectEqualizerApi.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/media/EffectPresetReverbApi.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/media/EffectVirtualizerApi.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/media/EffectVisualizerApi.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/media/EffectsFactoryApi.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/media/IAudioFlinger.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/media/IAudioFlingerClient.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/media/IAudioPolicyService.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/media/IAudioRecord.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/media/IAudioTrack.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/media/IEffect.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/media/IEffectClient.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/media/IMediaDeathNotifier.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/media/IMediaMetadataRetriever.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/media/IMediaPlayer.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/media/IMediaPlayerClient.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/media/IMediaPlayerService.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/media/IMediaRecorder.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/media/IMediaRecorderClient.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/media/IOMX.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/media/IStreamSource.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/media/JetPlayer.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/media/MediaMetadataRetrieverInterface.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/media/MediaPlayerInterface.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/media/MediaProfiles.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/media/MediaRecorderBase.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/media/Metadata.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/media/ToneGenerator.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/media/Visualizer.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/media/mediametadataretriever.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/media/mediaplayer.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/media/mediarecorder.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/media/mediascanner.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/media/stagefright/ACodec.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/media/stagefright/AMRWriter.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/media/stagefright/AudioPlayer.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/media/stagefright/AudioSource.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/media/stagefright/CameraSource.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/media/stagefright/CameraSourceTimeLapse.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/media/stagefright/ColorConverter.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/media/stagefright/DataSource.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/media/stagefright/FileSource.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/media/stagefright/HardwareAPI.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/media/stagefright/JPEGSource.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/media/stagefright/MPEG2TSWriter.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/media/stagefright/MPEG4Writer.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/media/stagefright/MediaBuffer.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/media/stagefright/MediaBufferGroup.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/media/stagefright/MediaDebug.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/media/stagefright/MediaDefs.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/media/stagefright/MediaErrors.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/media/stagefright/MediaExtractor.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/media/stagefright/MediaSource.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/media/stagefright/MediaSourceSplitter.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/media/stagefright/MediaWriter.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/media/stagefright/MetaData.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/media/stagefright/NativeWindowWrapper.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/media/stagefright/OMXClient.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/media/stagefright/OMXCodec.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/media/stagefright/OMXPluginBase.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/media/stagefright/ShoutcastSource.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/media/stagefright/StagefrightMediaScanner.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/media/stagefright/TimeSource.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/media/stagefright/Utils.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/media/stagefright/VideoSourceDownSampler.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/media/stagefright/YUVCanvas.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/media/stagefright/YUVImage.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/media/stagefright/foundation/AAtomizer.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/media/stagefright/foundation/ABase.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/media/stagefright/foundation/ABitReader.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/media/stagefright/foundation/ABuffer.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/media/stagefright/foundation/ADebug.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/media/stagefright/foundation/AHandler.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/media/stagefright/foundation/AHandlerReflector.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/media/stagefright/foundation/AHierarchicalStateMachine.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/media/stagefright/foundation/ALooper.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/media/stagefright/foundation/ALooperRoster.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/media/stagefright/foundation/AMessage.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/media/stagefright/foundation/AString.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/media/stagefright/foundation/base64.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/media/stagefright/foundation/hexdump.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/media/stagefright/openmax/OMX_Audio.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/media/stagefright/openmax/OMX_Component.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/media/stagefright/openmax/OMX_ContentPipe.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/media/stagefright/openmax/OMX_Core.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/media/stagefright/openmax/OMX_IVCommon.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/media/stagefright/openmax/OMX_Image.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/media/stagefright/openmax/OMX_Index.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/media/stagefright/openmax/OMX_Other.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/media/stagefright/openmax/OMX_Types.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/media/stagefright/openmax/OMX_Video.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/media/thread_init.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/pim/EventRecurrence.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/private/README (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/private/binder/Static.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/private/binder/binder_module.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/private/hwui/DrawGlInfo.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/private/media/AudioEffectShared.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/private/media/AudioTrackShared.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/private/media/VideoFrame.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/private/opengles/gl_context.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/private/surfaceflinger/LayerState.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/private/surfaceflinger/SharedBufferStack.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/private/ui/RegionHelper.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/private/ui/android_natives_priv.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/private/utils/Static.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/storage/IMountService.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/storage/IMountServiceListener.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/storage/IMountShutdownObserver.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/storage/IObbActionListener.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/surfaceflinger/IGraphicBufferAlloc.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/surfaceflinger/ISurface.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/surfaceflinger/ISurfaceComposer.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/surfaceflinger/ISurfaceComposerClient.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/surfaceflinger/Surface.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/surfaceflinger/SurfaceComposerClient.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/tts/TtsEngine.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/ui/DisplayInfo.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/ui/EGLNativeSurface.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/ui/EGLUtils.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/ui/FramebufferNativeWindow.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/ui/GraphicBuffer.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/ui/GraphicBufferAllocator.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/ui/GraphicBufferMapper.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/ui/GraphicLog.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/ui/Input.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/ui/InputTransport.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/ui/KeyCharacterMap.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/ui/KeyLayoutMap.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/ui/Keyboard.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/ui/KeycodeLabels.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/ui/PixelFormat.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/ui/Point.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/ui/PowerManager.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/ui/Rect.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/ui/Region.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/ui/VirtualKeyMap.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/ui/android_native_buffer.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/ui/egl/android_natives.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/utils/Asset.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/utils/AssetDir.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/utils/AssetManager.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/utils/Atomic.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/utils/BackupHelpers.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/utils/BitSet.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/utils/BufferedTextOutput.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/utils/ByteOrder.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/utils/CallStack.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/utils/Compat.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/utils/Debug.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/utils/Endian.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/utils/Errors.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/utils/FileMap.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/utils/Flattenable.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/utils/Functor.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/utils/KeyedVector.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/utils/List.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/utils/Log.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/utils/Looper.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/utils/ObbFile.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/utils/Pool.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/utils/PropertyMap.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/utils/RefBase.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/utils/ResourceTypes.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/utils/SharedBuffer.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/utils/Singleton.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/utils/SortedVector.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/utils/StopWatch.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/utils/StreamingZipInflater.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/utils/String16.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/utils/String8.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/utils/StringArray.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/utils/StrongPointer.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/utils/SystemClock.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/utils/TextOutput.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/utils/Timers.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/utils/Tokenizer.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/utils/TypeHelpers.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/utils/Unicode.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/utils/Vector.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/utils/VectorImpl.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/utils/ZipFileCRO.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/utils/ZipFileRO.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/utils/ZipUtils.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/utils/ashmem.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/utils/misc.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/include/utils/threads.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/native/include/android/asset_manager.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/native/include/android/asset_manager_jni.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/native/include/android/bitmap.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/native/include/android/configuration.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/native/include/android/input.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/native/include/android/keycodes.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/native/include/android/looper.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/native/include/android/native_activity.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/native/include/android/native_window.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/native/include/android/native_window_jni.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/native/include/android/obb.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/native/include/android/rect.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/native/include/android/sensor.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/native/include/android/storage_manager.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/native/include/android/tts.h (100%) rename android-headers/{android-headers-hc => 13}/frameworks/base/native/include/android/window.h (100%) rename android-headers/{android-headers-hc => 13}/hardware/libhardware/include/hardware/audio.h (100%) rename android-headers/{android-headers-hc => 13}/hardware/libhardware/include/hardware/audio_hal.h (100%) rename android-headers/{android-headers-hc => 13}/hardware/libhardware/include/hardware/audio_policy.h (100%) rename android-headers/{android-headers-hc => 13}/hardware/libhardware/include/hardware/audio_policy_hal.h (100%) rename android-headers/{android-headers-hc => 13}/hardware/libhardware/include/hardware/camera.h (100%) rename android-headers/{android-headers-hc => 13}/hardware/libhardware/include/hardware/gps.h (100%) rename android-headers/{android-headers-hc => 13}/hardware/libhardware/include/hardware/gralloc.h (100%) rename android-headers/{android-headers-hc => 13}/hardware/libhardware/include/hardware/hardware.h (100%) rename android-headers/{android-headers-hc => 13}/hardware/libhardware/include/hardware/hwcomposer.h (100%) rename android-headers/{android-headers-hc => 13}/hardware/libhardware/include/hardware/lights.h (100%) rename android-headers/{android-headers-hc => 13}/hardware/libhardware/include/hardware/qemu_pipe.h (100%) rename android-headers/{android-headers-hc => 13}/hardware/libhardware/include/hardware/qemud.h (100%) rename android-headers/{android-headers-hc => 13}/hardware/libhardware/include/hardware/sensors.h (100%) rename android-headers/{android-headers-hc => 13}/system/core/include/android/log.h (100%) rename android-headers/{android-headers-hc => 13}/system/core/include/arch/darwin-x86/AndroidConfig.h (100%) rename android-headers/{android-headers-hc => 13}/system/core/include/arch/freebsd-x86/AndroidConfig.h (100%) rename android-headers/{android-headers-hc => 13}/system/core/include/arch/linux-arm/AndroidConfig.h (100%) rename android-headers/{android-headers-hc => 13}/system/core/include/arch/linux-ppc/AndroidConfig.h (100%) rename android-headers/{android-headers-hc => 13}/system/core/include/arch/linux-sh/AndroidConfig.h (100%) rename android-headers/{android-headers-hc => 13}/system/core/include/arch/linux-x86/AndroidConfig.h (100%) rename android-headers/{android-headers-hc => 13}/system/core/include/arch/target_linux-x86/AndroidConfig.h (100%) rename android-headers/{android-headers-hc => 13}/system/core/include/arch/windows/AndroidConfig.h (100%) rename android-headers/{android-headers-hc => 13}/system/core/include/ctest/ctest.h (100%) rename android-headers/{android-headers-hc => 13}/system/core/include/cutils/abort_socket.h (100%) rename android-headers/{android-headers-hc => 13}/system/core/include/cutils/android_reboot.h (100%) rename android-headers/{android-headers-hc => 13}/system/core/include/cutils/array.h (100%) rename android-headers/{android-headers-hc => 13}/system/core/include/cutils/ashmem.h (100%) rename android-headers/{android-headers-hc => 13}/system/core/include/cutils/atomic-arm.h (100%) rename android-headers/{android-headers-hc => 13}/system/core/include/cutils/atomic-inline.h (100%) rename android-headers/{android-headers-hc => 13}/system/core/include/cutils/atomic-x86.h (100%) rename android-headers/{android-headers-hc => 13}/system/core/include/cutils/atomic.h (100%) rename android-headers/{android-headers-hc => 13}/system/core/include/cutils/bitops.h (100%) rename android-headers/{android-headers-hc => 13}/system/core/include/cutils/compiler.h (100%) rename android-headers/{android-headers-hc => 13}/system/core/include/cutils/config_utils.h (100%) rename android-headers/{android-headers-hc => 13}/system/core/include/cutils/cpu_info.h (100%) rename android-headers/{android-headers-hc => 13}/system/core/include/cutils/dir_hash.h (100%) rename android-headers/{android-headers-hc => 13}/system/core/include/cutils/event_tag_map.h (100%) rename android-headers/{android-headers-hc => 13}/system/core/include/cutils/hashmap.h (100%) rename android-headers/{android-headers-hc => 13}/system/core/include/cutils/iosched_policy.h (100%) rename android-headers/{android-headers-hc => 13}/system/core/include/cutils/jstring.h (100%) rename android-headers/{android-headers-hc => 13}/system/core/include/cutils/klog.h (100%) rename android-headers/{android-headers-hc => 13}/system/core/include/cutils/list.h (100%) rename android-headers/{android-headers-hc => 13}/system/core/include/cutils/log.h (100%) rename android-headers/{android-headers-hc => 13}/system/core/include/cutils/logd.h (100%) rename android-headers/{android-headers-hc => 13}/system/core/include/cutils/logger.h (100%) rename android-headers/{android-headers-hc => 13}/system/core/include/cutils/logprint.h (100%) rename android-headers/{android-headers-hc => 13}/system/core/include/cutils/memory.h (100%) rename android-headers/{android-headers-hc => 13}/system/core/include/cutils/misc.h (100%) rename android-headers/{android-headers-hc => 13}/system/core/include/cutils/mq.h (100%) rename android-headers/{android-headers-hc => 13}/system/core/include/cutils/mspace.h (100%) rename android-headers/{android-headers-hc => 13}/system/core/include/cutils/native_handle.h (100%) rename android-headers/{android-headers-hc => 13}/system/core/include/cutils/open_memstream.h (100%) rename android-headers/{android-headers-hc => 13}/system/core/include/cutils/partition_utils.h (100%) rename android-headers/{android-headers-hc => 13}/system/core/include/cutils/process_name.h (100%) rename android-headers/{android-headers-hc => 13}/system/core/include/cutils/properties.h (100%) rename android-headers/{android-headers-hc => 13}/system/core/include/cutils/qtaguid.h (100%) rename android-headers/{android-headers-hc => 13}/system/core/include/cutils/record_stream.h (100%) rename android-headers/{android-headers-hc => 13}/system/core/include/cutils/sched_policy.h (100%) rename android-headers/{android-headers-hc => 13}/system/core/include/cutils/selector.h (100%) rename android-headers/{android-headers-hc => 13}/system/core/include/cutils/sockets.h (100%) rename android-headers/{android-headers-hc => 13}/system/core/include/cutils/str_parms.h (100%) rename android-headers/{android-headers-hc => 13}/system/core/include/cutils/threads.h (100%) rename android-headers/{android-headers-hc => 13}/system/core/include/cutils/tztime.h (100%) rename android-headers/{android-headers-hc => 13}/system/core/include/cutils/uevent.h (100%) rename android-headers/{android-headers-hc => 13}/system/core/include/cutils/uio.h (100%) rename android-headers/{android-headers-hc => 13}/system/core/include/cutils/zygote.h (100%) rename android-headers/{android-headers-hc => 13}/system/core/include/diskconfig/diskconfig.h (100%) rename android-headers/{android-headers-hc => 13}/system/core/include/mincrypt/rsa.h (100%) rename android-headers/{android-headers-hc => 13}/system/core/include/mincrypt/sha.h (100%) rename android-headers/{android-headers-hc => 13}/system/core/include/netutils/dhcp.h (100%) rename android-headers/{android-headers-hc => 13}/system/core/include/netutils/ifc.h (100%) rename android-headers/{android-headers-hc => 13}/system/core/include/pixelflinger/format.h (100%) rename android-headers/{android-headers-hc => 13}/system/core/include/pixelflinger/pixelflinger.h (100%) rename android-headers/{android-headers-hc => 13}/system/core/include/private/android_filesystem_config.h (100%) rename android-headers/{android-headers-hc => 13}/system/core/include/private/pixelflinger/ggl_context.h (100%) rename android-headers/{android-headers-hc => 13}/system/core/include/private/pixelflinger/ggl_fixed.h (100%) rename android-headers/{android-headers-hc => 13}/system/core/include/system/audio.h (100%) rename android-headers/{android-headers-hc => 13}/system/core/include/system/audio_policy.h (100%) rename android-headers/{android-headers-hc => 13}/system/core/include/system/camera.h (100%) rename android-headers/{android-headers-hc => 13}/system/core/include/system/graphics.h (100%) rename android-headers/{android-headers-hc => 13}/system/core/include/system/window.h (100%) rename android-headers/{android-headers-hc => 13}/system/core/include/sysutils/FrameworkClient.h (100%) rename android-headers/{android-headers-hc => 13}/system/core/include/sysutils/FrameworkCommand.h (100%) rename android-headers/{android-headers-hc => 13}/system/core/include/sysutils/FrameworkListener.h (100%) rename android-headers/{android-headers-hc => 13}/system/core/include/sysutils/NetlinkEvent.h (100%) rename android-headers/{android-headers-hc => 13}/system/core/include/sysutils/NetlinkListener.h (100%) rename android-headers/{android-headers-hc => 13}/system/core/include/sysutils/ServiceManager.h (100%) rename android-headers/{android-headers-hc => 13}/system/core/include/sysutils/SocketClient.h (100%) rename android-headers/{android-headers-hc => 13}/system/core/include/sysutils/SocketListener.h (100%) rename android-headers/{android-headers-hc => 13}/system/core/include/usbhost/usbhost.h (100%) rename android-headers/{android-headers-hc => 13}/system/core/include/zipfile/zipfile.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/android_runtime/ActivityManager.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/android_runtime/AndroidRuntime.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/android_runtime/android_app_NativeActivity.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/android_runtime/android_content_res_Configuration.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/android_runtime/android_graphics_SurfaceTexture.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/android_runtime/android_util_AssetManager.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/android_runtime/android_view_Surface.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/binder/Binder.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/binder/BinderService.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/binder/BpBinder.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/binder/CursorWindow.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/binder/IBinder.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/binder/IInterface.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/binder/IMemory.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/binder/IPCThreadState.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/binder/IPermissionController.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/binder/IServiceManager.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/binder/MemoryBase.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/binder/MemoryDealer.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/binder/MemoryHeapBase.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/binder/MemoryHeapPmem.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/binder/Parcel.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/binder/PermissionCache.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/binder/ProcessState.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/camera/Camera.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/camera/CameraParameters.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/camera/ICamera.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/camera/ICameraClient.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/camera/ICameraRecordingProxy.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/camera/ICameraRecordingProxyListener.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/camera/ICameraService.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/cpustats/CentralTendencyStatistics.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/cpustats/README.txt (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/cpustats/ThreadCpuUsage.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/diskusage/dirsize.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/drm/DrmConstraints.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/drm/DrmConvertedStatus.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/drm/DrmInfo.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/drm/DrmInfoEvent.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/drm/DrmInfoRequest.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/drm/DrmInfoStatus.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/drm/DrmManagerClient.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/drm/DrmMetadata.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/drm/DrmRights.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/drm/DrmSupportInfo.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/drm/drm_framework_common.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/gui/ISensorEventConnection.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/gui/ISensorServer.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/gui/ISurfaceTexture.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/gui/Sensor.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/gui/SensorChannel.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/gui/SensorEventQueue.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/gui/SensorManager.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/gui/SurfaceTexture.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/gui/SurfaceTextureClient.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/media/AudioEffect.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/media/AudioParameter.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/media/AudioRecord.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/media/AudioSystem.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/media/AudioTrack.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/media/EffectsFactoryApi.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/media/IAudioFlinger.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/media/IAudioFlingerClient.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/media/IAudioPolicyService.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/media/IAudioRecord.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/media/IAudioTrack.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/media/IEffect.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/media/IEffectClient.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/media/IMediaDeathNotifier.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/media/IMediaMetadataRetriever.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/media/IMediaPlayer.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/media/IMediaPlayerClient.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/media/IMediaPlayerService.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/media/IMediaRecorder.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/media/IMediaRecorderClient.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/media/IOMX.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/media/IStreamSource.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/media/JetPlayer.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/media/MediaMetadataRetrieverInterface.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/media/MediaPlayerInterface.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/media/MediaProfiles.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/media/MediaRecorderBase.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/media/MemoryLeakTrackUtil.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/media/Metadata.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/media/ToneGenerator.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/media/Visualizer.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/media/mediametadataretriever.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/media/mediaplayer.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/media/mediarecorder.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/media/mediascanner.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/media/stagefright/AACWriter.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/media/stagefright/ACodec.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/media/stagefright/AMRWriter.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/media/stagefright/AudioPlayer.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/media/stagefright/AudioSource.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/media/stagefright/CameraSource.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/media/stagefright/CameraSourceTimeLapse.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/media/stagefright/ColorConverter.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/media/stagefright/DataSource.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/media/stagefright/FileSource.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/media/stagefright/HardwareAPI.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/media/stagefright/JPEGSource.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/media/stagefright/MPEG2TSWriter.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/media/stagefright/MPEG4Writer.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/media/stagefright/MediaBuffer.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/media/stagefright/MediaBufferGroup.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/media/stagefright/MediaDebug.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/media/stagefright/MediaDefs.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/media/stagefright/MediaErrors.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/media/stagefright/MediaExtractor.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/media/stagefright/MediaSource.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/media/stagefright/MediaSourceSplitter.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/media/stagefright/MediaWriter.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/media/stagefright/MetaData.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/media/stagefright/MetadataBufferType.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/media/stagefright/NativeWindowWrapper.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/media/stagefright/OMXClient.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/media/stagefright/OMXCodec.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/media/stagefright/OMXPluginBase.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/media/stagefright/StagefrightMediaScanner.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/media/stagefright/SurfaceMediaSource.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/media/stagefright/TimeSource.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/media/stagefright/Utils.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/media/stagefright/VideoSourceDownSampler.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/media/stagefright/YUVCanvas.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/media/stagefright/YUVImage.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/media/stagefright/foundation/AAtomizer.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/media/stagefright/foundation/ABase.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/media/stagefright/foundation/ABitReader.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/media/stagefright/foundation/ABuffer.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/media/stagefright/foundation/ADebug.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/media/stagefright/foundation/AHandler.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/media/stagefright/foundation/AHandlerReflector.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/media/stagefright/foundation/AHierarchicalStateMachine.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/media/stagefright/foundation/ALooper.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/media/stagefright/foundation/ALooperRoster.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/media/stagefright/foundation/AMessage.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/media/stagefright/foundation/AString.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/media/stagefright/foundation/base64.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/media/stagefright/foundation/hexdump.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/media/stagefright/openmax/OMX_Audio.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/media/stagefright/openmax/OMX_Component.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/media/stagefright/openmax/OMX_ContentPipe.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/media/stagefright/openmax/OMX_Core.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/media/stagefright/openmax/OMX_IVCommon.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/media/stagefright/openmax/OMX_Image.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/media/stagefright/openmax/OMX_Index.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/media/stagefright/openmax/OMX_Other.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/media/stagefright/openmax/OMX_Types.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/media/stagefright/openmax/OMX_Video.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/media/thread_init.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/powermanager/IPowerManager.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/powermanager/PowerManager.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/private/README (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/private/binder/Static.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/private/binder/binder_module.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/private/hwui/DrawGlInfo.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/private/media/AudioEffectShared.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/private/media/AudioTrackShared.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/private/media/VideoFrame.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/private/opengles/gl_context.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/private/surfaceflinger/LayerState.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/private/surfaceflinger/SharedBufferStack.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/private/ui/RegionHelper.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/private/ui/android_natives_priv.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/private/utils/Static.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/storage/IMountService.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/storage/IMountServiceListener.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/storage/IMountShutdownObserver.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/storage/IObbActionListener.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/surfaceflinger/IGraphicBufferAlloc.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/surfaceflinger/ISurface.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/surfaceflinger/ISurfaceComposer.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/surfaceflinger/ISurfaceComposerClient.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/surfaceflinger/Surface.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/surfaceflinger/SurfaceComposerClient.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/ui/DisplayInfo.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/ui/EGLNativeSurface.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/ui/EGLUtils.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/ui/FramebufferNativeWindow.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/ui/GraphicBuffer.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/ui/GraphicBufferAllocator.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/ui/GraphicBufferMapper.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/ui/GraphicLog.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/ui/Input.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/ui/InputTransport.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/ui/KeyCharacterMap.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/ui/KeyLayoutMap.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/ui/Keyboard.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/ui/KeycodeLabels.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/ui/PixelFormat.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/ui/Point.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/ui/PowerManager.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/ui/Rect.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/ui/Region.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/ui/VirtualKeyMap.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/ui/android_native_buffer.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/ui/egl/android_natives.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/utils/Asset.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/utils/AssetDir.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/utils/AssetManager.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/utils/Atomic.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/utils/BackupHelpers.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/utils/BitSet.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/utils/BlobCache.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/utils/BufferedTextOutput.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/utils/ByteOrder.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/utils/CallStack.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/utils/Compat.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/utils/Debug.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/utils/Endian.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/utils/Errors.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/utils/FileMap.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/utils/Flattenable.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/utils/Functor.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/utils/GenerationCache.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/utils/KeyedVector.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/utils/LinearTransform.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/utils/List.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/utils/Log.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/utils/Looper.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/utils/ObbFile.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/utils/PropertyMap.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/utils/RefBase.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/utils/ResourceTypes.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/utils/SharedBuffer.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/utils/Singleton.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/utils/SortedVector.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/utils/StopWatch.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/utils/StreamingZipInflater.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/utils/String16.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/utils/String8.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/utils/StringArray.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/utils/StrongPointer.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/utils/SystemClock.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/utils/TextOutput.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/utils/Timers.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/utils/Tokenizer.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/utils/TypeHelpers.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/utils/Unicode.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/utils/Vector.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/utils/VectorImpl.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/utils/ZipFileCRO.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/utils/ZipFileRO.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/utils/ZipUtils.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/utils/ashmem.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/utils/misc.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/include/utils/threads.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/native/include/android/asset_manager.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/native/include/android/asset_manager_jni.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/native/include/android/bitmap.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/native/include/android/configuration.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/native/include/android/input.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/native/include/android/keycodes.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/native/include/android/looper.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/native/include/android/native_activity.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/native/include/android/native_window.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/native/include/android/native_window_jni.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/native/include/android/obb.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/native/include/android/rect.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/native/include/android/sensor.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/native/include/android/storage_manager.h (100%) rename android-headers/{android-headers-ics => 14}/frameworks/base/native/include/android/window.h (100%) rename android-headers/{android-headers-ics => 14}/hardware/libhardware/include/hardware/audio.h (100%) rename android-headers/{android-headers-ics => 14}/hardware/libhardware/include/hardware/audio_effect.h (100%) rename android-headers/{android-headers-ics => 14}/hardware/libhardware/include/hardware/audio_policy.h (100%) rename android-headers/{android-headers-ics => 14}/hardware/libhardware/include/hardware/camera.h (100%) rename android-headers/{android-headers-ics => 14}/hardware/libhardware/include/hardware/fb.h (100%) rename android-headers/{android-headers-ics => 14}/hardware/libhardware/include/hardware/gps.h (100%) rename android-headers/{android-headers-ics => 14}/hardware/libhardware/include/hardware/gralloc.h (100%) rename android-headers/{android-headers-ics => 14}/hardware/libhardware/include/hardware/hardware.h (100%) rename android-headers/{android-headers-ics => 14}/hardware/libhardware/include/hardware/hwcomposer.h (100%) rename android-headers/{android-headers-ics => 14}/hardware/libhardware/include/hardware/lights.h (100%) rename android-headers/{android-headers-ics => 14}/hardware/libhardware/include/hardware/nfc.h (100%) rename android-headers/{android-headers-ics => 14}/hardware/libhardware/include/hardware/qemu_pipe.h (100%) rename android-headers/{android-headers-ics => 14}/hardware/libhardware/include/hardware/qemud.h (100%) rename android-headers/{android-headers-ics => 14}/hardware/libhardware/include/hardware/sensors.h (100%) rename android-headers/{android-headers-ics => 14}/system/core/include/android/log.h (100%) rename android-headers/{android-headers-ics => 14}/system/core/include/arch/darwin-x86/AndroidConfig.h (100%) rename android-headers/{android-headers-ics => 14}/system/core/include/arch/freebsd-x86/AndroidConfig.h (100%) rename android-headers/{android-headers-ics => 14}/system/core/include/arch/linux-arm/AndroidConfig.h (100%) rename android-headers/{android-headers-ics => 14}/system/core/include/arch/linux-ppc/AndroidConfig.h (100%) rename android-headers/{android-headers-ics => 14}/system/core/include/arch/linux-sh/AndroidConfig.h (100%) rename android-headers/{android-headers-ics => 14}/system/core/include/arch/linux-x86/AndroidConfig.h (100%) rename android-headers/{android-headers-ics => 14}/system/core/include/arch/target_linux-x86/AndroidConfig.h (100%) rename android-headers/{android-headers-ics => 14}/system/core/include/arch/windows/AndroidConfig.h (100%) rename android-headers/{android-headers-ics => 14}/system/core/include/ctest/ctest.h (100%) rename android-headers/{android-headers-ics => 14}/system/core/include/cutils/abort_socket.h (100%) rename android-headers/{android-headers-ics => 14}/system/core/include/cutils/android_reboot.h (100%) rename android-headers/{android-headers-ics => 14}/system/core/include/cutils/array.h (100%) rename android-headers/{android-headers-ics => 14}/system/core/include/cutils/ashmem.h (100%) rename android-headers/{android-headers-ics => 14}/system/core/include/cutils/atomic-arm.h (100%) rename android-headers/{android-headers-ics => 14}/system/core/include/cutils/atomic-inline.h (100%) rename android-headers/{android-headers-ics => 14}/system/core/include/cutils/atomic-x86.h (100%) rename android-headers/{android-headers-ics => 14}/system/core/include/cutils/atomic.h (100%) rename android-headers/{android-headers-ics => 14}/system/core/include/cutils/bitops.h (100%) rename android-headers/{android-headers-ics => 14}/system/core/include/cutils/compiler.h (100%) rename android-headers/{android-headers-ics => 14}/system/core/include/cutils/config_utils.h (100%) rename android-headers/{android-headers-ics => 14}/system/core/include/cutils/cpu_info.h (100%) rename android-headers/{android-headers-ics => 14}/system/core/include/cutils/dir_hash.h (100%) rename android-headers/{android-headers-ics => 14}/system/core/include/cutils/event_tag_map.h (100%) rename android-headers/{android-headers-ics => 14}/system/core/include/cutils/hashmap.h (100%) rename android-headers/{android-headers-ics => 14}/system/core/include/cutils/iosched_policy.h (100%) rename android-headers/{android-headers-ics => 14}/system/core/include/cutils/jstring.h (100%) rename android-headers/{android-headers-ics => 14}/system/core/include/cutils/klog.h (100%) rename android-headers/{android-headers-ics => 14}/system/core/include/cutils/list.h (100%) rename android-headers/{android-headers-ics => 14}/system/core/include/cutils/log.h (100%) rename android-headers/{android-headers-ics => 14}/system/core/include/cutils/logd.h (100%) rename android-headers/{android-headers-ics => 14}/system/core/include/cutils/logger.h (100%) rename android-headers/{android-headers-ics => 14}/system/core/include/cutils/logprint.h (100%) rename android-headers/{android-headers-ics => 14}/system/core/include/cutils/memory.h (100%) rename android-headers/{android-headers-ics => 14}/system/core/include/cutils/misc.h (100%) rename android-headers/{android-headers-ics => 14}/system/core/include/cutils/mq.h (100%) rename android-headers/{android-headers-ics => 14}/system/core/include/cutils/mspace.h (100%) rename android-headers/{android-headers-ics => 14}/system/core/include/cutils/native_handle.h (100%) rename android-headers/{android-headers-ics => 14}/system/core/include/cutils/open_memstream.h (100%) rename android-headers/{android-headers-ics => 14}/system/core/include/cutils/partition_utils.h (100%) rename android-headers/{android-headers-ics => 14}/system/core/include/cutils/process_name.h (100%) rename android-headers/{android-headers-ics => 14}/system/core/include/cutils/properties.h (100%) rename android-headers/{android-headers-ics => 14}/system/core/include/cutils/qtaguid.h (100%) rename android-headers/{android-headers-ics => 14}/system/core/include/cutils/record_stream.h (100%) rename android-headers/{android-headers-ics => 14}/system/core/include/cutils/sched_policy.h (100%) rename android-headers/{android-headers-ics => 14}/system/core/include/cutils/selector.h (100%) rename android-headers/{android-headers-ics => 14}/system/core/include/cutils/sockets.h (100%) rename android-headers/{android-headers-ics => 14}/system/core/include/cutils/str_parms.h (100%) rename android-headers/{android-headers-ics => 14}/system/core/include/cutils/threads.h (100%) rename android-headers/{android-headers-ics => 14}/system/core/include/cutils/tztime.h (100%) rename android-headers/{android-headers-ics => 14}/system/core/include/cutils/uevent.h (100%) rename android-headers/{android-headers-ics => 14}/system/core/include/cutils/uio.h (100%) rename android-headers/{android-headers-ics => 14}/system/core/include/cutils/zygote.h (100%) rename android-headers/{android-headers-ics => 14}/system/core/include/diskconfig/diskconfig.h (100%) rename android-headers/{android-headers-ics => 14}/system/core/include/mincrypt/rsa.h (100%) rename android-headers/{android-headers-ics => 14}/system/core/include/mincrypt/sha.h (100%) rename android-headers/{android-headers-ics => 14}/system/core/include/netutils/dhcp.h (100%) rename android-headers/{android-headers-ics => 14}/system/core/include/netutils/ifc.h (100%) rename android-headers/{android-headers-ics => 14}/system/core/include/pixelflinger/format.h (100%) rename android-headers/{android-headers-ics => 14}/system/core/include/pixelflinger/pixelflinger.h (100%) rename android-headers/{android-headers-ics => 14}/system/core/include/private/android_filesystem_config.h (100%) rename android-headers/{android-headers-ics => 14}/system/core/include/private/pixelflinger/ggl_context.h (100%) rename android-headers/{android-headers-ics => 14}/system/core/include/private/pixelflinger/ggl_fixed.h (100%) rename android-headers/{android-headers-ics => 14}/system/core/include/system/audio.h (100%) rename android-headers/{android-headers-ics => 14}/system/core/include/system/audio_policy.h (100%) rename android-headers/{android-headers-ics => 14}/system/core/include/system/camera.h (100%) rename android-headers/{android-headers-ics => 14}/system/core/include/system/graphics.h (100%) rename android-headers/{android-headers-ics => 14}/system/core/include/system/window.h (100%) rename android-headers/{android-headers-ics => 14}/system/core/include/sysutils/FrameworkClient.h (100%) rename android-headers/{android-headers-ics => 14}/system/core/include/sysutils/FrameworkCommand.h (100%) rename android-headers/{android-headers-ics => 14}/system/core/include/sysutils/FrameworkListener.h (100%) rename android-headers/{android-headers-ics => 14}/system/core/include/sysutils/NetlinkEvent.h (100%) rename android-headers/{android-headers-ics => 14}/system/core/include/sysutils/NetlinkListener.h (100%) rename android-headers/{android-headers-ics => 14}/system/core/include/sysutils/ServiceManager.h (100%) rename android-headers/{android-headers-ics => 14}/system/core/include/sysutils/SocketClient.h (100%) rename android-headers/{android-headers-ics => 14}/system/core/include/sysutils/SocketListener.h (100%) rename android-headers/{android-headers-ics => 14}/system/core/include/usbhost/usbhost.h (100%) rename android-headers/{android-headers-ics => 14}/system/core/include/zipfile/zipfile.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/AudioBufferProvider.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/AudioEffect.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/AudioParameter.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/AudioRecord.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/AudioSystem.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/AudioTrack.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/EffectsFactoryApi.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/ExtendedAudioBufferProvider.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/IAudioFlinger.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/IAudioFlingerClient.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/IAudioPolicyService.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/IAudioRecord.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/IAudioTrack.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/ICrypto.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/IDrm.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/IDrmClient.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/IEffect.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/IEffectClient.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/IHDCP.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/IMediaDeathNotifier.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/IMediaLogService.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/IMediaMetadataRetriever.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/IMediaPlayer.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/IMediaPlayerClient.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/IMediaPlayerService.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/IMediaRecorder.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/IMediaRecorderClient.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/IOMX.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/IRemoteDisplay.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/IRemoteDisplayClient.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/IStreamSource.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/JetPlayer.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/MediaMetadataRetrieverInterface.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/MediaPlayerInterface.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/MediaProfiles.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/MediaRecorderBase.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/MemoryLeakTrackUtil.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/Metadata.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/SingleStateQueue.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/SoundPool.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/ToneGenerator.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/Visualizer.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/mediametadataretriever.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/mediaplayer.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/mediarecorder.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/mediascanner.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/nbaio/AudioBufferProviderSource.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/nbaio/AudioStreamInSource.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/nbaio/AudioStreamOutSink.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/nbaio/LibsndfileSink.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/nbaio/LibsndfileSource.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/nbaio/MonoPipe.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/nbaio/MonoPipeReader.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/nbaio/NBAIO.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/nbaio/NBLog.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/nbaio/Pipe.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/nbaio/PipeReader.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/nbaio/SourceAudioBufferProvider.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/nbaio/roundup.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/stagefright/AACWriter.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/stagefright/ACodec.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/stagefright/AMRWriter.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/stagefright/AudioPlayer.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/stagefright/AudioSource.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/stagefright/BufferProducerWrapper.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/stagefright/CameraSource.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/stagefright/CameraSourceTimeLapse.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/stagefright/ColorConverter.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/stagefright/DataSource.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/stagefright/FileSource.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/stagefright/JPEGSource.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/stagefright/MPEG2TSWriter.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/stagefright/MPEG4Writer.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/stagefright/MediaAdapter.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/stagefright/MediaBuffer.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/stagefright/MediaBufferGroup.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/stagefright/MediaCodec.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/stagefright/MediaCodecList.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/stagefright/MediaDefs.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/stagefright/MediaErrors.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/stagefright/MediaExtractor.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/stagefright/MediaMuxer.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/stagefright/MediaSource.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/stagefright/MediaWriter.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/stagefright/MetaData.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/stagefright/NativeWindowWrapper.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/stagefright/NuMediaExtractor.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/stagefright/OMXClient.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/stagefright/OMXCodec.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/stagefright/SkipCutBuffer.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/stagefright/StagefrightMediaScanner.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/stagefright/SurfaceMediaSource.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/stagefright/TimeSource.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/stagefright/Utils.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/stagefright/YUVCanvas.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/stagefright/YUVImage.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/stagefright/foundation/AAtomizer.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/stagefright/foundation/ABase.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/stagefright/foundation/ABitReader.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/stagefright/foundation/ABuffer.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/stagefright/foundation/ADebug.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/stagefright/foundation/AHandler.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/stagefright/foundation/AHandlerReflector.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/stagefright/foundation/AHierarchicalStateMachine.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/stagefright/foundation/ALooper.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/stagefright/foundation/ALooperRoster.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/stagefright/foundation/AMessage.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/stagefright/foundation/AString.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/stagefright/foundation/base64.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/stagefright/foundation/hexdump.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/av/include/media/stagefright/timedtext/TimedTextDriver.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/binder/AppOpsManager.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/binder/Binder.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/binder/BinderService.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/binder/BpBinder.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/binder/IAppOpsCallback.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/binder/IAppOpsService.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/binder/IBinder.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/binder/IInterface.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/binder/IMemory.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/binder/IPCThreadState.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/binder/IPermissionController.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/binder/IServiceManager.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/binder/MemoryBase.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/binder/MemoryDealer.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/binder/MemoryHeapBase.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/binder/Parcel.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/binder/PermissionCache.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/binder/ProcessState.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/gui/BitTube.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/gui/BufferItemConsumer.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/gui/BufferQueue.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/gui/ConsumerBase.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/gui/CpuConsumer.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/gui/DisplayEventReceiver.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/gui/DummyConsumer.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/gui/GLConsumer.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/gui/GraphicBufferAlloc.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/gui/GuiConfig.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/gui/IDisplayEventConnection.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/gui/IGraphicBufferAlloc.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/gui/IGraphicBufferProducer.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/gui/ISensorEventConnection.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/gui/ISensorServer.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/gui/ISurfaceComposer.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/gui/ISurfaceComposerClient.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/gui/Sensor.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/gui/SensorEventQueue.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/gui/SensorManager.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/gui/Surface.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/gui/SurfaceComposerClient.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/gui/SurfaceControl.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/media/drm/DrmAPI.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/media/editor/II420ColorConverter.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/media/hardware/CryptoAPI.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/media/hardware/HDCPAPI.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/media/hardware/HardwareAPI.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/media/hardware/MetadataBufferType.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/media/hardware/OMXPluginBase.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/media/openmax/OMX_Audio.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/media/openmax/OMX_Component.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/media/openmax/OMX_ContentPipe.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/media/openmax/OMX_Core.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/media/openmax/OMX_IVCommon.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/media/openmax/OMX_Image.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/media/openmax/OMX_Index.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/media/openmax/OMX_IndexExt.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/media/openmax/OMX_Other.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/media/openmax/OMX_Types.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/media/openmax/OMX_Video.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/media/openmax/OMX_VideoExt.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/ui/ANativeObjectBase.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/ui/DisplayInfo.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/ui/Fence.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/ui/FramebufferNativeWindow.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/ui/GraphicBuffer.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/ui/GraphicBufferAllocator.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/ui/GraphicBufferMapper.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/ui/PixelFormat.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/ui/Point.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/ui/Rect.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/ui/Region.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/ui/UiConfig.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/utils/AndroidThreads.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/utils/Atomic.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/utils/BasicHashtable.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/utils/BitSet.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/utils/BlobCache.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/utils/BufferedTextOutput.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/utils/ByteOrder.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/utils/CallStack.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/utils/Compat.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/utils/Condition.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/utils/Debug.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/utils/Endian.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/utils/Errors.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/utils/FileMap.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/utils/Flattenable.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/utils/Functor.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/utils/GenerationCache.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/utils/JenkinsHash.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/utils/KeyedVector.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/utils/LinearAllocator.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/utils/LinearTransform.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/utils/List.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/utils/Log.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/utils/Looper.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/utils/LruCache.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/utils/Mutex.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/utils/PropertyMap.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/utils/RWLock.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/utils/RefBase.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/utils/SharedBuffer.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/utils/Singleton.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/utils/SortedVector.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/utils/StopWatch.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/utils/String16.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/utils/String8.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/utils/StringArray.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/utils/StrongPointer.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/utils/SystemClock.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/utils/TextOutput.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/utils/Thread.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/utils/ThreadDefs.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/utils/Timers.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/utils/Tokenizer.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/utils/Trace.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/utils/TypeHelpers.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/utils/Unicode.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/utils/UniquePtr.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/utils/Vector.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/utils/VectorImpl.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/utils/WorkQueue.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/utils/ZipFileCRO.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/utils/ZipFileRO.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/utils/ZipUtils.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/utils/ashmem.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/utils/misc.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/frameworks/native/include/utils/threads.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/hardware/libhardware/include/hardware/audio.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/hardware/libhardware/include/hardware/audio_effect.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/hardware/libhardware/include/hardware/audio_policy.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/hardware/libhardware/include/hardware/bluetooth.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/hardware/libhardware/include/hardware/bt_av.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/hardware/libhardware/include/hardware/bt_gatt.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/hardware/libhardware/include/hardware/bt_gatt_client.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/hardware/libhardware/include/hardware/bt_gatt_server.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/hardware/libhardware/include/hardware/bt_gatt_types.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/hardware/libhardware/include/hardware/bt_hf.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/hardware/libhardware/include/hardware/bt_hh.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/hardware/libhardware/include/hardware/bt_hl.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/hardware/libhardware/include/hardware/bt_pan.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/hardware/libhardware/include/hardware/bt_rc.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/hardware/libhardware/include/hardware/bt_sock.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/hardware/libhardware/include/hardware/camera.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/hardware/libhardware/include/hardware/camera2.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/hardware/libhardware/include/hardware/camera3.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/hardware/libhardware/include/hardware/camera_common.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/hardware/libhardware/include/hardware/fb.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/hardware/libhardware/include/hardware/gps.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/hardware/libhardware/include/hardware/gralloc.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/hardware/libhardware/include/hardware/hardware.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/hardware/libhardware/include/hardware/hwcomposer.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/hardware/libhardware/include/hardware/hwcomposer_defs.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/hardware/libhardware/include/hardware/keymaster.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/hardware/libhardware/include/hardware/lights.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/hardware/libhardware/include/hardware/local_time_hal.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/hardware/libhardware/include/hardware/nfc.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/hardware/libhardware/include/hardware/power.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/hardware/libhardware/include/hardware/qemu_pipe.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/hardware/libhardware/include/hardware/qemud.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/hardware/libhardware/include/hardware/sensors.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/system/core/include/cutils/abort_socket.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/system/core/include/cutils/android_reboot.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/system/core/include/cutils/aref.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/system/core/include/cutils/array.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/system/core/include/cutils/ashmem.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/system/core/include/cutils/atomic-arm.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/system/core/include/cutils/atomic-inline.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/system/core/include/cutils/atomic-mips.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/system/core/include/cutils/atomic-x86.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/system/core/include/cutils/atomic.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/system/core/include/cutils/bitops.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/system/core/include/cutils/compiler.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/system/core/include/cutils/config_utils.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/system/core/include/cutils/cpu_info.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/system/core/include/cutils/debugger.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/system/core/include/cutils/dir_hash.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/system/core/include/cutils/event_tag_map.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/system/core/include/cutils/fs.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/system/core/include/cutils/hashmap.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/system/core/include/cutils/iosched_policy.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/system/core/include/cutils/jstring.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/system/core/include/cutils/klog.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/system/core/include/cutils/list.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/system/core/include/cutils/log.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/system/core/include/cutils/logd.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/system/core/include/cutils/logger.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/system/core/include/cutils/logprint.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/system/core/include/cutils/memory.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/system/core/include/cutils/misc.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/system/core/include/cutils/mq.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/system/core/include/cutils/multiuser.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/system/core/include/cutils/native_handle.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/system/core/include/cutils/open_memstream.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/system/core/include/cutils/partition_utils.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/system/core/include/cutils/process_name.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/system/core/include/cutils/properties.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/system/core/include/cutils/qsort_r_compat.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/system/core/include/cutils/qtaguid.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/system/core/include/cutils/record_stream.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/system/core/include/cutils/sched_policy.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/system/core/include/cutils/selector.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/system/core/include/cutils/sockets.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/system/core/include/cutils/str_parms.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/system/core/include/cutils/threads.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/system/core/include/cutils/trace.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/system/core/include/cutils/tztime.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/system/core/include/cutils/uevent.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/system/core/include/cutils/uio.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/system/core/include/cutils/zygote.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/system/core/include/sync/sw_sync.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/system/core/include/sync/sync.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/system/core/include/system/audio.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/system/core/include/system/audio_policy.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/system/core/include/system/camera.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/system/core/include/system/graphics.h (100%) rename android-headers/{android-headers-jbmr2 => 18}/system/core/include/system/window.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/AudioBufferProvider.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/AudioEffect.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/AudioParameter.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/AudioRecord.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/AudioSystem.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/AudioTimestamp.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/AudioTrack.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/EffectsFactoryApi.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/ExtendedAudioBufferProvider.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/IAudioFlinger.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/IAudioFlingerClient.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/IAudioPolicyService.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/IAudioRecord.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/IAudioTrack.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/ICrypto.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/IDrm.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/IDrmClient.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/IEffect.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/IEffectClient.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/IHDCP.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/IMediaDeathNotifier.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/IMediaLogService.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/IMediaMetadataRetriever.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/IMediaPlayer.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/IMediaPlayerClient.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/IMediaPlayerService.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/IMediaRecorder.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/IMediaRecorderClient.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/IOMX.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/IRemoteDisplay.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/IRemoteDisplayClient.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/IStreamSource.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/JetPlayer.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/MediaMetadataRetrieverInterface.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/MediaPlayerInterface.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/MediaProfiles.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/MediaRecorderBase.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/MemoryLeakTrackUtil.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/Metadata.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/SingleStateQueue.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/SoundPool.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/ToneGenerator.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/Visualizer.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/mediametadataretriever.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/mediaplayer.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/mediarecorder.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/mediascanner.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/nbaio/AudioBufferProviderSource.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/nbaio/AudioStreamInSource.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/nbaio/AudioStreamOutSink.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/nbaio/LibsndfileSink.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/nbaio/LibsndfileSource.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/nbaio/MonoPipe.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/nbaio/MonoPipeReader.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/nbaio/NBAIO.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/nbaio/NBLog.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/nbaio/Pipe.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/nbaio/PipeReader.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/nbaio/SourceAudioBufferProvider.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/nbaio/roundup.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/stagefright/AACWriter.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/stagefright/ACodec.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/stagefright/AMRWriter.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/stagefright/AudioPlayer.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/stagefright/AudioSource.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/stagefright/BufferProducerWrapper.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/stagefright/CameraSource.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/stagefright/CameraSourceTimeLapse.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/stagefright/ColorConverter.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/stagefright/DataSource.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/stagefright/FileSource.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/stagefright/JPEGSource.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/stagefright/MPEG2TSWriter.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/stagefright/MPEG4Writer.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/stagefright/MediaAdapter.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/stagefright/MediaBuffer.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/stagefright/MediaBufferGroup.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/stagefright/MediaCodec.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/stagefright/MediaCodecList.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/stagefright/MediaDefs.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/stagefright/MediaErrors.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/stagefright/MediaExtractor.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/stagefright/MediaMuxer.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/stagefright/MediaSource.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/stagefright/MediaWriter.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/stagefright/MetaData.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/stagefright/NativeWindowWrapper.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/stagefright/NuMediaExtractor.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/stagefright/OMXClient.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/stagefright/OMXCodec.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/stagefright/SkipCutBuffer.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/stagefright/StagefrightMediaScanner.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/stagefright/SurfaceMediaSource.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/stagefright/TimeSource.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/stagefright/Utils.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/stagefright/YUVCanvas.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/stagefright/YUVImage.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/stagefright/foundation/AAtomizer.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/stagefright/foundation/ABase.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/stagefright/foundation/ABitReader.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/stagefright/foundation/ABuffer.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/stagefright/foundation/ADebug.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/stagefright/foundation/AHandler.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/stagefright/foundation/AHandlerReflector.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/stagefright/foundation/AHierarchicalStateMachine.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/stagefright/foundation/ALooper.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/stagefright/foundation/ALooperRoster.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/stagefright/foundation/AMessage.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/stagefright/foundation/ANetworkSession.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/stagefright/foundation/AString.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/stagefright/foundation/ParsedMessage.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/stagefright/foundation/base64.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/stagefright/foundation/hexdump.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/av/include/media/stagefright/timedtext/TimedTextDriver.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/native/include/binder/AppOpsManager.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/native/include/binder/Binder.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/native/include/binder/BinderService.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/native/include/binder/BpBinder.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/native/include/binder/BufferedTextOutput.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/native/include/binder/Debug.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/native/include/binder/IAppOpsCallback.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/native/include/binder/IAppOpsService.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/native/include/binder/IBinder.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/native/include/binder/IInterface.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/native/include/binder/IMemory.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/native/include/binder/IPCThreadState.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/native/include/binder/IPermissionController.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/native/include/binder/IServiceManager.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/native/include/binder/MemoryBase.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/native/include/binder/MemoryDealer.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/native/include/binder/MemoryHeapBase.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/native/include/binder/Parcel.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/native/include/binder/PermissionCache.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/native/include/binder/ProcessState.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/native/include/binder/TextOutput.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/native/include/gui/BitTube.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/native/include/gui/BufferItemConsumer.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/native/include/gui/BufferQueue.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/native/include/gui/ConsumerBase.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/native/include/gui/CpuConsumer.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/native/include/gui/DisplayEventReceiver.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/native/include/gui/GLConsumer.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/native/include/gui/GraphicBufferAlloc.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/native/include/gui/GuiConfig.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/native/include/gui/IConsumerListener.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/native/include/gui/IDisplayEventConnection.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/native/include/gui/IGraphicBufferAlloc.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/native/include/gui/IGraphicBufferConsumer.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/native/include/gui/IGraphicBufferProducer.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/native/include/gui/ISensorEventConnection.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/native/include/gui/ISensorServer.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/native/include/gui/ISurfaceComposer.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/native/include/gui/ISurfaceComposerClient.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/native/include/gui/Sensor.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/native/include/gui/SensorEventQueue.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/native/include/gui/SensorManager.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/native/include/gui/Surface.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/native/include/gui/SurfaceComposerClient.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/native/include/gui/SurfaceControl.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/native/include/media/drm/DrmAPI.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/native/include/media/editor/II420ColorConverter.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/native/include/media/hardware/CryptoAPI.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/native/include/media/hardware/HDCPAPI.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/native/include/media/hardware/HardwareAPI.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/native/include/media/hardware/MetadataBufferType.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/native/include/media/hardware/OMXPluginBase.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/native/include/media/openmax/OMX_Audio.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/native/include/media/openmax/OMX_Component.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/native/include/media/openmax/OMX_ContentPipe.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/native/include/media/openmax/OMX_Core.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/native/include/media/openmax/OMX_IVCommon.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/native/include/media/openmax/OMX_Image.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/native/include/media/openmax/OMX_Index.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/native/include/media/openmax/OMX_IndexExt.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/native/include/media/openmax/OMX_Other.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/native/include/media/openmax/OMX_Types.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/native/include/media/openmax/OMX_Video.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/native/include/media/openmax/OMX_VideoExt.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/native/include/ui/ANativeObjectBase.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/native/include/ui/DisplayInfo.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/native/include/ui/Fence.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/native/include/ui/FramebufferNativeWindow.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/native/include/ui/GraphicBuffer.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/native/include/ui/GraphicBufferAllocator.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/native/include/ui/GraphicBufferMapper.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/native/include/ui/PixelFormat.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/native/include/ui/Point.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/native/include/ui/Rect.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/native/include/ui/Region.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/native/include/ui/TMatHelpers.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/native/include/ui/TVecHelpers.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/native/include/ui/UiConfig.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/native/include/ui/mat4.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/native/include/ui/vec2.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/native/include/ui/vec3.h (100%) rename android-headers/{android-headers-kk => 19}/frameworks/native/include/ui/vec4.h (100%) rename android-headers/{android-headers-kk => 19}/hardware/libhardware/include/hardware/audio.h (100%) rename android-headers/{android-headers-kk => 19}/hardware/libhardware/include/hardware/audio_effect.h (100%) rename android-headers/{android-headers-kk => 19}/hardware/libhardware/include/hardware/audio_policy.h (100%) rename android-headers/{android-headers-kk => 19}/hardware/libhardware/include/hardware/bluetooth.h (100%) rename android-headers/{android-headers-kk => 19}/hardware/libhardware/include/hardware/bt_av.h (100%) rename android-headers/{android-headers-kk => 19}/hardware/libhardware/include/hardware/bt_gatt.h (100%) rename android-headers/{android-headers-kk => 19}/hardware/libhardware/include/hardware/bt_gatt_client.h (100%) rename android-headers/{android-headers-kk => 19}/hardware/libhardware/include/hardware/bt_gatt_server.h (100%) rename android-headers/{android-headers-kk => 19}/hardware/libhardware/include/hardware/bt_gatt_types.h (100%) rename android-headers/{android-headers-kk => 19}/hardware/libhardware/include/hardware/bt_hf.h (100%) rename android-headers/{android-headers-kk => 19}/hardware/libhardware/include/hardware/bt_hh.h (100%) rename android-headers/{android-headers-kk => 19}/hardware/libhardware/include/hardware/bt_hl.h (100%) rename android-headers/{android-headers-kk => 19}/hardware/libhardware/include/hardware/bt_pan.h (100%) rename android-headers/{android-headers-kk => 19}/hardware/libhardware/include/hardware/bt_rc.h (100%) rename android-headers/{android-headers-kk => 19}/hardware/libhardware/include/hardware/bt_sock.h (100%) rename android-headers/{android-headers-kk => 19}/hardware/libhardware/include/hardware/camera.h (100%) rename android-headers/{android-headers-kk => 19}/hardware/libhardware/include/hardware/camera2.h (100%) rename android-headers/{android-headers-kk => 19}/hardware/libhardware/include/hardware/camera3.h (100%) rename android-headers/{android-headers-kk => 19}/hardware/libhardware/include/hardware/camera_common.h (100%) rename android-headers/{android-headers-kk => 19}/hardware/libhardware/include/hardware/consumerir.h (100%) rename android-headers/{android-headers-kk => 19}/hardware/libhardware/include/hardware/fb.h (100%) rename android-headers/{android-headers-kk => 19}/hardware/libhardware/include/hardware/fused_location.h (100%) rename android-headers/{android-headers-kk => 19}/hardware/libhardware/include/hardware/gps.h (100%) rename android-headers/{android-headers-kk => 19}/hardware/libhardware/include/hardware/gralloc.h (100%) rename android-headers/{android-headers-kk => 19}/hardware/libhardware/include/hardware/hardware.h (100%) rename android-headers/{android-headers-kk => 19}/hardware/libhardware/include/hardware/hwcomposer.h (100%) rename android-headers/{android-headers-kk => 19}/hardware/libhardware/include/hardware/hwcomposer_defs.h (100%) rename android-headers/{android-headers-kk => 19}/hardware/libhardware/include/hardware/keymaster.h (100%) rename android-headers/{android-headers-kk => 19}/hardware/libhardware/include/hardware/lights.h (100%) rename android-headers/{android-headers-kk => 19}/hardware/libhardware/include/hardware/local_time_hal.h (100%) rename android-headers/{android-headers-kk => 19}/hardware/libhardware/include/hardware/memtrack.h (100%) rename android-headers/{android-headers-kk => 19}/hardware/libhardware/include/hardware/nfc.h (100%) rename android-headers/{android-headers-kk => 19}/hardware/libhardware/include/hardware/power.h (100%) rename android-headers/{android-headers-kk => 19}/hardware/libhardware/include/hardware/qemu_pipe.h (100%) rename android-headers/{android-headers-kk => 19}/hardware/libhardware/include/hardware/qemud.h (100%) rename android-headers/{android-headers-kk => 19}/hardware/libhardware/include/hardware/sensors.h (100%) rename android-headers/{android-headers-kk => 19}/system/core/include/cutils/android_reboot.h (100%) rename android-headers/{android-headers-kk => 19}/system/core/include/cutils/aref.h (100%) rename android-headers/{android-headers-kk => 19}/system/core/include/cutils/ashmem.h (100%) rename android-headers/{android-headers-kk => 19}/system/core/include/cutils/atomic-arm.h (100%) rename android-headers/{android-headers-kk => 19}/system/core/include/cutils/atomic-inline.h (100%) rename android-headers/{android-headers-kk => 19}/system/core/include/cutils/atomic-mips.h (100%) rename android-headers/{android-headers-kk => 19}/system/core/include/cutils/atomic-x86.h (100%) rename android-headers/{android-headers-kk => 19}/system/core/include/cutils/atomic.h (100%) rename android-headers/{android-headers-kk => 19}/system/core/include/cutils/bitops.h (100%) rename android-headers/{android-headers-kk => 19}/system/core/include/cutils/compiler.h (100%) rename android-headers/{android-headers-kk => 19}/system/core/include/cutils/config_utils.h (100%) rename android-headers/{android-headers-kk => 19}/system/core/include/cutils/cpu_info.h (100%) rename android-headers/{android-headers-kk => 19}/system/core/include/cutils/debugger.h (100%) rename android-headers/{android-headers-kk => 19}/system/core/include/cutils/dir_hash.h (100%) rename android-headers/{android-headers-kk => 19}/system/core/include/cutils/fs.h (100%) rename android-headers/{android-headers-kk => 19}/system/core/include/cutils/hashmap.h (100%) rename android-headers/{android-headers-kk => 19}/system/core/include/cutils/iosched_policy.h (100%) rename android-headers/{android-headers-kk => 19}/system/core/include/cutils/jstring.h (100%) rename android-headers/{android-headers-kk => 19}/system/core/include/cutils/klog.h (100%) rename android-headers/{android-headers-kk => 19}/system/core/include/cutils/list.h (100%) rename android-headers/{android-headers-kk => 19}/system/core/include/cutils/log.h (100%) rename android-headers/{android-headers-kk => 19}/system/core/include/cutils/memory.h (100%) rename android-headers/{android-headers-kk => 19}/system/core/include/cutils/misc.h (100%) rename android-headers/{android-headers-kk => 19}/system/core/include/cutils/multiuser.h (100%) rename android-headers/{android-headers-kk => 19}/system/core/include/cutils/native_handle.h (100%) rename android-headers/{android-headers-kk => 19}/system/core/include/cutils/open_memstream.h (100%) rename android-headers/{android-headers-kk => 19}/system/core/include/cutils/partition_utils.h (100%) rename android-headers/{android-headers-kk => 19}/system/core/include/cutils/process_name.h (100%) rename android-headers/{android-headers-kk => 19}/system/core/include/cutils/properties.h (100%) rename android-headers/{android-headers-kk => 19}/system/core/include/cutils/qtaguid.h (100%) rename android-headers/{android-headers-kk => 19}/system/core/include/cutils/record_stream.h (100%) rename android-headers/{android-headers-kk => 19}/system/core/include/cutils/sched_policy.h (100%) rename android-headers/{android-headers-kk => 19}/system/core/include/cutils/sockets.h (100%) rename android-headers/{android-headers-kk => 19}/system/core/include/cutils/str_parms.h (100%) rename android-headers/{android-headers-kk => 19}/system/core/include/cutils/threads.h (100%) rename android-headers/{android-headers-kk => 19}/system/core/include/cutils/trace.h (100%) rename android-headers/{android-headers-kk => 19}/system/core/include/cutils/tztime.h (100%) rename android-headers/{android-headers-kk => 19}/system/core/include/cutils/uevent.h (100%) rename android-headers/{android-headers-kk => 19}/system/core/include/log/event_tag_map.h (100%) rename android-headers/{android-headers-kk => 19}/system/core/include/log/log.h (100%) rename android-headers/{android-headers-kk => 19}/system/core/include/log/logd.h (100%) rename android-headers/{android-headers-kk => 19}/system/core/include/log/logger.h (100%) rename android-headers/{android-headers-kk => 19}/system/core/include/log/logprint.h (100%) rename android-headers/{android-headers-kk => 19}/system/core/include/log/uio.h (100%) rename android-headers/{android-headers-kk => 19}/system/core/include/sync/sw_sync.h (100%) rename android-headers/{android-headers-kk => 19}/system/core/include/sync/sync.h (100%) rename android-headers/{android-headers-kk => 19}/system/core/include/system/audio.h (100%) rename android-headers/{android-headers-kk => 19}/system/core/include/system/audio_policy.h (100%) rename android-headers/{android-headers-kk => 19}/system/core/include/system/camera.h (100%) rename android-headers/{android-headers-kk => 19}/system/core/include/system/graphics.h (100%) rename android-headers/{android-headers-kk => 19}/system/core/include/system/thread_defs.h (100%) rename android-headers/{android-headers-kk => 19}/system/core/include/system/window.h (100%) rename android-headers/{android-headers-kk => 19}/system/core/include/utils/AndroidThreads.h (100%) rename android-headers/{android-headers-kk => 19}/system/core/include/utils/Atomic.h (100%) rename android-headers/{android-headers-kk => 19}/system/core/include/utils/BasicHashtable.h (100%) rename android-headers/{android-headers-kk => 19}/system/core/include/utils/BitSet.h (100%) rename android-headers/{android-headers-kk => 19}/system/core/include/utils/BlobCache.h (100%) rename android-headers/{android-headers-kk => 19}/system/core/include/utils/ByteOrder.h (100%) rename android-headers/{android-headers-kk => 19}/system/core/include/utils/CallStack.h (100%) rename android-headers/{android-headers-kk => 19}/system/core/include/utils/Compat.h (100%) rename android-headers/{android-headers-kk => 19}/system/core/include/utils/Condition.h (100%) rename android-headers/{android-headers-kk => 19}/system/core/include/utils/Debug.h (100%) rename android-headers/{android-headers-kk => 19}/system/core/include/utils/Endian.h (100%) rename android-headers/{android-headers-kk => 19}/system/core/include/utils/Errors.h (100%) rename android-headers/{android-headers-kk => 19}/system/core/include/utils/FileMap.h (100%) rename android-headers/{android-headers-kk => 19}/system/core/include/utils/Flattenable.h (100%) rename android-headers/{android-headers-kk => 19}/system/core/include/utils/Functor.h (100%) rename android-headers/{android-headers-kk => 19}/system/core/include/utils/JenkinsHash.h (100%) rename android-headers/{android-headers-kk => 19}/system/core/include/utils/KeyedVector.h (100%) rename android-headers/{android-headers-kk => 19}/system/core/include/utils/LinearAllocator.h (100%) rename android-headers/{android-headers-kk => 19}/system/core/include/utils/LinearTransform.h (100%) rename android-headers/{android-headers-kk => 19}/system/core/include/utils/List.h (100%) rename android-headers/{android-headers-kk => 19}/system/core/include/utils/Log.h (100%) rename android-headers/{android-headers-kk => 19}/system/core/include/utils/Looper.h (100%) rename android-headers/{android-headers-kk => 19}/system/core/include/utils/LruCache.h (100%) rename android-headers/{android-headers-kk => 19}/system/core/include/utils/Mutex.h (100%) rename android-headers/{android-headers-kk => 19}/system/core/include/utils/PropertyMap.h (100%) rename android-headers/{android-headers-kk => 19}/system/core/include/utils/RWLock.h (100%) rename android-headers/{android-headers-kk => 19}/system/core/include/utils/RefBase.h (100%) rename android-headers/{android-headers-kk => 19}/system/core/include/utils/SharedBuffer.h (100%) rename android-headers/{android-headers-kk => 19}/system/core/include/utils/Singleton.h (100%) rename android-headers/{android-headers-kk => 19}/system/core/include/utils/SortedVector.h (100%) rename android-headers/{android-headers-kk => 19}/system/core/include/utils/StopWatch.h (100%) rename android-headers/{android-headers-kk => 19}/system/core/include/utils/String16.h (100%) rename android-headers/{android-headers-kk => 19}/system/core/include/utils/String8.h (100%) rename android-headers/{android-headers-kk => 19}/system/core/include/utils/StrongPointer.h (100%) rename android-headers/{android-headers-kk => 19}/system/core/include/utils/SystemClock.h (100%) rename android-headers/{android-headers-kk => 19}/system/core/include/utils/Thread.h (100%) rename android-headers/{android-headers-kk => 19}/system/core/include/utils/ThreadDefs.h (100%) rename android-headers/{android-headers-kk => 19}/system/core/include/utils/Timers.h (100%) rename android-headers/{android-headers-kk => 19}/system/core/include/utils/Tokenizer.h (100%) rename android-headers/{android-headers-kk => 19}/system/core/include/utils/Trace.h (100%) rename android-headers/{android-headers-kk => 19}/system/core/include/utils/TypeHelpers.h (100%) rename android-headers/{android-headers-kk => 19}/system/core/include/utils/Unicode.h (100%) rename android-headers/{android-headers-kk => 19}/system/core/include/utils/UniquePtr.h (100%) rename android-headers/{android-headers-kk => 19}/system/core/include/utils/Vector.h (100%) rename android-headers/{android-headers-kk => 19}/system/core/include/utils/VectorImpl.h (100%) rename android-headers/{android-headers-kk => 19}/system/core/include/utils/ashmem.h (100%) rename android-headers/{android-headers-kk => 19}/system/core/include/utils/misc.h (100%) rename android-headers/{android-headers-kk => 19}/system/core/include/utils/threads.h (100%) diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/android_runtime/ActivityManager.h b/android-headers/10/frameworks/base/include/android_runtime/ActivityManager.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/android_runtime/ActivityManager.h rename to android-headers/10/frameworks/base/include/android_runtime/ActivityManager.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/android_runtime/AndroidRuntime.h b/android-headers/10/frameworks/base/include/android_runtime/AndroidRuntime.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/android_runtime/AndroidRuntime.h rename to android-headers/10/frameworks/base/include/android_runtime/AndroidRuntime.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/android_runtime/android_app_NativeActivity.h b/android-headers/10/frameworks/base/include/android_runtime/android_app_NativeActivity.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/android_runtime/android_app_NativeActivity.h rename to android-headers/10/frameworks/base/include/android_runtime/android_app_NativeActivity.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/android_runtime/android_content_res_Configuration.h b/android-headers/10/frameworks/base/include/android_runtime/android_content_res_Configuration.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/android_runtime/android_content_res_Configuration.h rename to android-headers/10/frameworks/base/include/android_runtime/android_content_res_Configuration.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/android_runtime/android_util_AssetManager.h b/android-headers/10/frameworks/base/include/android_runtime/android_util_AssetManager.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/android_runtime/android_util_AssetManager.h rename to android-headers/10/frameworks/base/include/android_runtime/android_util_AssetManager.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/android_runtime/android_view_Surface.h b/android-headers/10/frameworks/base/include/android_runtime/android_view_Surface.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/android_runtime/android_view_Surface.h rename to android-headers/10/frameworks/base/include/android_runtime/android_view_Surface.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/binder/Binder.h b/android-headers/10/frameworks/base/include/binder/Binder.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/binder/Binder.h rename to android-headers/10/frameworks/base/include/binder/Binder.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/binder/BinderService.h b/android-headers/10/frameworks/base/include/binder/BinderService.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/binder/BinderService.h rename to android-headers/10/frameworks/base/include/binder/BinderService.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/binder/BpBinder.h b/android-headers/10/frameworks/base/include/binder/BpBinder.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/binder/BpBinder.h rename to android-headers/10/frameworks/base/include/binder/BpBinder.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/binder/IBinder.h b/android-headers/10/frameworks/base/include/binder/IBinder.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/binder/IBinder.h rename to android-headers/10/frameworks/base/include/binder/IBinder.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/binder/IInterface.h b/android-headers/10/frameworks/base/include/binder/IInterface.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/binder/IInterface.h rename to android-headers/10/frameworks/base/include/binder/IInterface.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/binder/IMemory.h b/android-headers/10/frameworks/base/include/binder/IMemory.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/binder/IMemory.h rename to android-headers/10/frameworks/base/include/binder/IMemory.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/binder/IPCThreadState.h b/android-headers/10/frameworks/base/include/binder/IPCThreadState.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/binder/IPCThreadState.h rename to android-headers/10/frameworks/base/include/binder/IPCThreadState.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/binder/IPermissionController.h b/android-headers/10/frameworks/base/include/binder/IPermissionController.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/binder/IPermissionController.h rename to android-headers/10/frameworks/base/include/binder/IPermissionController.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/binder/IServiceManager.h b/android-headers/10/frameworks/base/include/binder/IServiceManager.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/binder/IServiceManager.h rename to android-headers/10/frameworks/base/include/binder/IServiceManager.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/binder/MemoryBase.h b/android-headers/10/frameworks/base/include/binder/MemoryBase.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/binder/MemoryBase.h rename to android-headers/10/frameworks/base/include/binder/MemoryBase.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/binder/MemoryDealer.h b/android-headers/10/frameworks/base/include/binder/MemoryDealer.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/binder/MemoryDealer.h rename to android-headers/10/frameworks/base/include/binder/MemoryDealer.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/binder/MemoryHeapBase.h b/android-headers/10/frameworks/base/include/binder/MemoryHeapBase.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/binder/MemoryHeapBase.h rename to android-headers/10/frameworks/base/include/binder/MemoryHeapBase.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/binder/MemoryHeapPmem.h b/android-headers/10/frameworks/base/include/binder/MemoryHeapPmem.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/binder/MemoryHeapPmem.h rename to android-headers/10/frameworks/base/include/binder/MemoryHeapPmem.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/binder/Parcel.h b/android-headers/10/frameworks/base/include/binder/Parcel.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/binder/Parcel.h rename to android-headers/10/frameworks/base/include/binder/Parcel.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/binder/Permission.h b/android-headers/10/frameworks/base/include/binder/Permission.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/binder/Permission.h rename to android-headers/10/frameworks/base/include/binder/Permission.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/binder/ProcessState.h b/android-headers/10/frameworks/base/include/binder/ProcessState.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/binder/ProcessState.h rename to android-headers/10/frameworks/base/include/binder/ProcessState.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/camera/Camera.h b/android-headers/10/frameworks/base/include/camera/Camera.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/camera/Camera.h rename to android-headers/10/frameworks/base/include/camera/Camera.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/camera/CameraHardwareInterface.h b/android-headers/10/frameworks/base/include/camera/CameraHardwareInterface.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/camera/CameraHardwareInterface.h rename to android-headers/10/frameworks/base/include/camera/CameraHardwareInterface.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/camera/CameraParameters.h b/android-headers/10/frameworks/base/include/camera/CameraParameters.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/camera/CameraParameters.h rename to android-headers/10/frameworks/base/include/camera/CameraParameters.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/camera/ICamera.h b/android-headers/10/frameworks/base/include/camera/ICamera.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/camera/ICamera.h rename to android-headers/10/frameworks/base/include/camera/ICamera.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/camera/ICameraClient.h b/android-headers/10/frameworks/base/include/camera/ICameraClient.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/camera/ICameraClient.h rename to android-headers/10/frameworks/base/include/camera/ICameraClient.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/camera/ICameraService.h b/android-headers/10/frameworks/base/include/camera/ICameraService.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/camera/ICameraService.h rename to android-headers/10/frameworks/base/include/camera/ICameraService.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/gui/ISensorEventConnection.h b/android-headers/10/frameworks/base/include/gui/ISensorEventConnection.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/gui/ISensorEventConnection.h rename to android-headers/10/frameworks/base/include/gui/ISensorEventConnection.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/gui/ISensorServer.h b/android-headers/10/frameworks/base/include/gui/ISensorServer.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/gui/ISensorServer.h rename to android-headers/10/frameworks/base/include/gui/ISensorServer.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/gui/Sensor.h b/android-headers/10/frameworks/base/include/gui/Sensor.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/gui/Sensor.h rename to android-headers/10/frameworks/base/include/gui/Sensor.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/gui/SensorChannel.h b/android-headers/10/frameworks/base/include/gui/SensorChannel.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/gui/SensorChannel.h rename to android-headers/10/frameworks/base/include/gui/SensorChannel.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/gui/SensorEventQueue.h b/android-headers/10/frameworks/base/include/gui/SensorEventQueue.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/gui/SensorEventQueue.h rename to android-headers/10/frameworks/base/include/gui/SensorEventQueue.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/gui/SensorManager.h b/android-headers/10/frameworks/base/include/gui/SensorManager.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/gui/SensorManager.h rename to android-headers/10/frameworks/base/include/gui/SensorManager.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/media/AudioEffect.h b/android-headers/10/frameworks/base/include/media/AudioEffect.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/media/AudioEffect.h rename to android-headers/10/frameworks/base/include/media/AudioEffect.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/media/AudioRecord.h b/android-headers/10/frameworks/base/include/media/AudioRecord.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/media/AudioRecord.h rename to android-headers/10/frameworks/base/include/media/AudioRecord.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/media/AudioSystem.h b/android-headers/10/frameworks/base/include/media/AudioSystem.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/media/AudioSystem.h rename to android-headers/10/frameworks/base/include/media/AudioSystem.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/media/AudioTrack.h b/android-headers/10/frameworks/base/include/media/AudioTrack.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/media/AudioTrack.h rename to android-headers/10/frameworks/base/include/media/AudioTrack.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/media/EffectApi.h b/android-headers/10/frameworks/base/include/media/EffectApi.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/media/EffectApi.h rename to android-headers/10/frameworks/base/include/media/EffectApi.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/media/EffectBassBoostApi.h b/android-headers/10/frameworks/base/include/media/EffectBassBoostApi.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/media/EffectBassBoostApi.h rename to android-headers/10/frameworks/base/include/media/EffectBassBoostApi.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/media/EffectEnvironmentalReverbApi.h b/android-headers/10/frameworks/base/include/media/EffectEnvironmentalReverbApi.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/media/EffectEnvironmentalReverbApi.h rename to android-headers/10/frameworks/base/include/media/EffectEnvironmentalReverbApi.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/media/EffectEqualizerApi.h b/android-headers/10/frameworks/base/include/media/EffectEqualizerApi.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/media/EffectEqualizerApi.h rename to android-headers/10/frameworks/base/include/media/EffectEqualizerApi.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/media/EffectPresetReverbApi.h b/android-headers/10/frameworks/base/include/media/EffectPresetReverbApi.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/media/EffectPresetReverbApi.h rename to android-headers/10/frameworks/base/include/media/EffectPresetReverbApi.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/media/EffectVirtualizerApi.h b/android-headers/10/frameworks/base/include/media/EffectVirtualizerApi.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/media/EffectVirtualizerApi.h rename to android-headers/10/frameworks/base/include/media/EffectVirtualizerApi.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/media/EffectVisualizerApi.h b/android-headers/10/frameworks/base/include/media/EffectVisualizerApi.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/media/EffectVisualizerApi.h rename to android-headers/10/frameworks/base/include/media/EffectVisualizerApi.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/media/EffectsFactoryApi.h b/android-headers/10/frameworks/base/include/media/EffectsFactoryApi.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/media/EffectsFactoryApi.h rename to android-headers/10/frameworks/base/include/media/EffectsFactoryApi.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/media/IAudioFlinger.h b/android-headers/10/frameworks/base/include/media/IAudioFlinger.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/media/IAudioFlinger.h rename to android-headers/10/frameworks/base/include/media/IAudioFlinger.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/media/IAudioFlingerClient.h b/android-headers/10/frameworks/base/include/media/IAudioFlingerClient.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/media/IAudioFlingerClient.h rename to android-headers/10/frameworks/base/include/media/IAudioFlingerClient.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/media/IAudioPolicyService.h b/android-headers/10/frameworks/base/include/media/IAudioPolicyService.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/media/IAudioPolicyService.h rename to android-headers/10/frameworks/base/include/media/IAudioPolicyService.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/media/IAudioRecord.h b/android-headers/10/frameworks/base/include/media/IAudioRecord.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/media/IAudioRecord.h rename to android-headers/10/frameworks/base/include/media/IAudioRecord.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/media/IAudioTrack.h b/android-headers/10/frameworks/base/include/media/IAudioTrack.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/media/IAudioTrack.h rename to android-headers/10/frameworks/base/include/media/IAudioTrack.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/media/IEffect.h b/android-headers/10/frameworks/base/include/media/IEffect.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/media/IEffect.h rename to android-headers/10/frameworks/base/include/media/IEffect.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/media/IEffectClient.h b/android-headers/10/frameworks/base/include/media/IEffectClient.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/media/IEffectClient.h rename to android-headers/10/frameworks/base/include/media/IEffectClient.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/media/IMediaDeathNotifier.h b/android-headers/10/frameworks/base/include/media/IMediaDeathNotifier.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/media/IMediaDeathNotifier.h rename to android-headers/10/frameworks/base/include/media/IMediaDeathNotifier.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/media/IMediaMetadataRetriever.h b/android-headers/10/frameworks/base/include/media/IMediaMetadataRetriever.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/media/IMediaMetadataRetriever.h rename to android-headers/10/frameworks/base/include/media/IMediaMetadataRetriever.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/media/IMediaPlayer.h b/android-headers/10/frameworks/base/include/media/IMediaPlayer.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/media/IMediaPlayer.h rename to android-headers/10/frameworks/base/include/media/IMediaPlayer.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/media/IMediaPlayerClient.h b/android-headers/10/frameworks/base/include/media/IMediaPlayerClient.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/media/IMediaPlayerClient.h rename to android-headers/10/frameworks/base/include/media/IMediaPlayerClient.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/media/IMediaPlayerService.h b/android-headers/10/frameworks/base/include/media/IMediaPlayerService.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/media/IMediaPlayerService.h rename to android-headers/10/frameworks/base/include/media/IMediaPlayerService.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/media/IMediaRecorder.h b/android-headers/10/frameworks/base/include/media/IMediaRecorder.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/media/IMediaRecorder.h rename to android-headers/10/frameworks/base/include/media/IMediaRecorder.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/media/IMediaRecorderClient.h b/android-headers/10/frameworks/base/include/media/IMediaRecorderClient.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/media/IMediaRecorderClient.h rename to android-headers/10/frameworks/base/include/media/IMediaRecorderClient.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/media/IOMX.h b/android-headers/10/frameworks/base/include/media/IOMX.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/media/IOMX.h rename to android-headers/10/frameworks/base/include/media/IOMX.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/media/JetPlayer.h b/android-headers/10/frameworks/base/include/media/JetPlayer.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/media/JetPlayer.h rename to android-headers/10/frameworks/base/include/media/JetPlayer.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/media/MediaMetadataRetrieverInterface.h b/android-headers/10/frameworks/base/include/media/MediaMetadataRetrieverInterface.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/media/MediaMetadataRetrieverInterface.h rename to android-headers/10/frameworks/base/include/media/MediaMetadataRetrieverInterface.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/media/MediaPlayerInterface.h b/android-headers/10/frameworks/base/include/media/MediaPlayerInterface.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/media/MediaPlayerInterface.h rename to android-headers/10/frameworks/base/include/media/MediaPlayerInterface.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/media/MediaProfiles.h b/android-headers/10/frameworks/base/include/media/MediaProfiles.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/media/MediaProfiles.h rename to android-headers/10/frameworks/base/include/media/MediaProfiles.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/media/MediaRecorderBase.h b/android-headers/10/frameworks/base/include/media/MediaRecorderBase.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/media/MediaRecorderBase.h rename to android-headers/10/frameworks/base/include/media/MediaRecorderBase.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/media/Metadata.h b/android-headers/10/frameworks/base/include/media/Metadata.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/media/Metadata.h rename to android-headers/10/frameworks/base/include/media/Metadata.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/media/OverlayRenderer.h b/android-headers/10/frameworks/base/include/media/OverlayRenderer.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/media/OverlayRenderer.h rename to android-headers/10/frameworks/base/include/media/OverlayRenderer.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/media/PVMediaRecorder.h b/android-headers/10/frameworks/base/include/media/PVMediaRecorder.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/media/PVMediaRecorder.h rename to android-headers/10/frameworks/base/include/media/PVMediaRecorder.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/media/PVMetadataRetriever.h b/android-headers/10/frameworks/base/include/media/PVMetadataRetriever.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/media/PVMetadataRetriever.h rename to android-headers/10/frameworks/base/include/media/PVMetadataRetriever.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/media/PVPlayer.h b/android-headers/10/frameworks/base/include/media/PVPlayer.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/media/PVPlayer.h rename to android-headers/10/frameworks/base/include/media/PVPlayer.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/media/ToneGenerator.h b/android-headers/10/frameworks/base/include/media/ToneGenerator.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/media/ToneGenerator.h rename to android-headers/10/frameworks/base/include/media/ToneGenerator.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/media/Visualizer.h b/android-headers/10/frameworks/base/include/media/Visualizer.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/media/Visualizer.h rename to android-headers/10/frameworks/base/include/media/Visualizer.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/media/mediametadataretriever.h b/android-headers/10/frameworks/base/include/media/mediametadataretriever.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/media/mediametadataretriever.h rename to android-headers/10/frameworks/base/include/media/mediametadataretriever.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/media/mediaplayer.h b/android-headers/10/frameworks/base/include/media/mediaplayer.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/media/mediaplayer.h rename to android-headers/10/frameworks/base/include/media/mediaplayer.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/media/mediarecorder.h b/android-headers/10/frameworks/base/include/media/mediarecorder.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/media/mediarecorder.h rename to android-headers/10/frameworks/base/include/media/mediarecorder.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/media/mediascanner.h b/android-headers/10/frameworks/base/include/media/mediascanner.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/media/mediascanner.h rename to android-headers/10/frameworks/base/include/media/mediascanner.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/media/stagefright/AMRWriter.h b/android-headers/10/frameworks/base/include/media/stagefright/AMRWriter.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/media/stagefright/AMRWriter.h rename to android-headers/10/frameworks/base/include/media/stagefright/AMRWriter.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/media/stagefright/AudioPlayer.h b/android-headers/10/frameworks/base/include/media/stagefright/AudioPlayer.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/media/stagefright/AudioPlayer.h rename to android-headers/10/frameworks/base/include/media/stagefright/AudioPlayer.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/media/stagefright/AudioSource.h b/android-headers/10/frameworks/base/include/media/stagefright/AudioSource.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/media/stagefright/AudioSource.h rename to android-headers/10/frameworks/base/include/media/stagefright/AudioSource.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/media/stagefright/CameraSource.h b/android-headers/10/frameworks/base/include/media/stagefright/CameraSource.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/media/stagefright/CameraSource.h rename to android-headers/10/frameworks/base/include/media/stagefright/CameraSource.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/media/stagefright/ColorConverter.h b/android-headers/10/frameworks/base/include/media/stagefright/ColorConverter.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/media/stagefright/ColorConverter.h rename to android-headers/10/frameworks/base/include/media/stagefright/ColorConverter.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/media/stagefright/DataSource.h b/android-headers/10/frameworks/base/include/media/stagefright/DataSource.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/media/stagefright/DataSource.h rename to android-headers/10/frameworks/base/include/media/stagefright/DataSource.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/media/stagefright/FileSource.h b/android-headers/10/frameworks/base/include/media/stagefright/FileSource.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/media/stagefright/FileSource.h rename to android-headers/10/frameworks/base/include/media/stagefright/FileSource.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/media/stagefright/HardwareAPI.h b/android-headers/10/frameworks/base/include/media/stagefright/HardwareAPI.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/media/stagefright/HardwareAPI.h rename to android-headers/10/frameworks/base/include/media/stagefright/HardwareAPI.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/media/stagefright/JPEGSource.h b/android-headers/10/frameworks/base/include/media/stagefright/JPEGSource.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/media/stagefright/JPEGSource.h rename to android-headers/10/frameworks/base/include/media/stagefright/JPEGSource.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/media/stagefright/MPEG2TSWriter.h b/android-headers/10/frameworks/base/include/media/stagefright/MPEG2TSWriter.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/media/stagefright/MPEG2TSWriter.h rename to android-headers/10/frameworks/base/include/media/stagefright/MPEG2TSWriter.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/media/stagefright/MPEG4Writer.h b/android-headers/10/frameworks/base/include/media/stagefright/MPEG4Writer.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/media/stagefright/MPEG4Writer.h rename to android-headers/10/frameworks/base/include/media/stagefright/MPEG4Writer.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/media/stagefright/MediaBuffer.h b/android-headers/10/frameworks/base/include/media/stagefright/MediaBuffer.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/media/stagefright/MediaBuffer.h rename to android-headers/10/frameworks/base/include/media/stagefright/MediaBuffer.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/media/stagefright/MediaBufferGroup.h b/android-headers/10/frameworks/base/include/media/stagefright/MediaBufferGroup.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/media/stagefright/MediaBufferGroup.h rename to android-headers/10/frameworks/base/include/media/stagefright/MediaBufferGroup.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/media/stagefright/MediaDebug.h b/android-headers/10/frameworks/base/include/media/stagefright/MediaDebug.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/media/stagefright/MediaDebug.h rename to android-headers/10/frameworks/base/include/media/stagefright/MediaDebug.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/media/stagefright/MediaDefs.h b/android-headers/10/frameworks/base/include/media/stagefright/MediaDefs.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/media/stagefright/MediaDefs.h rename to android-headers/10/frameworks/base/include/media/stagefright/MediaDefs.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/media/stagefright/MediaErrors.h b/android-headers/10/frameworks/base/include/media/stagefright/MediaErrors.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/media/stagefright/MediaErrors.h rename to android-headers/10/frameworks/base/include/media/stagefright/MediaErrors.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/media/stagefright/MediaExtractor.h b/android-headers/10/frameworks/base/include/media/stagefright/MediaExtractor.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/media/stagefright/MediaExtractor.h rename to android-headers/10/frameworks/base/include/media/stagefright/MediaExtractor.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/media/stagefright/MediaSource.h b/android-headers/10/frameworks/base/include/media/stagefright/MediaSource.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/media/stagefright/MediaSource.h rename to android-headers/10/frameworks/base/include/media/stagefright/MediaSource.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/media/stagefright/MediaWriter.h b/android-headers/10/frameworks/base/include/media/stagefright/MediaWriter.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/media/stagefright/MediaWriter.h rename to android-headers/10/frameworks/base/include/media/stagefright/MediaWriter.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/media/stagefright/MetaData.h b/android-headers/10/frameworks/base/include/media/stagefright/MetaData.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/media/stagefright/MetaData.h rename to android-headers/10/frameworks/base/include/media/stagefright/MetaData.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/media/stagefright/OMXClient.h b/android-headers/10/frameworks/base/include/media/stagefright/OMXClient.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/media/stagefright/OMXClient.h rename to android-headers/10/frameworks/base/include/media/stagefright/OMXClient.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/media/stagefright/OMXCodec.h b/android-headers/10/frameworks/base/include/media/stagefright/OMXCodec.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/media/stagefright/OMXCodec.h rename to android-headers/10/frameworks/base/include/media/stagefright/OMXCodec.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/media/stagefright/OMXPluginBase.h b/android-headers/10/frameworks/base/include/media/stagefright/OMXPluginBase.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/media/stagefright/OMXPluginBase.h rename to android-headers/10/frameworks/base/include/media/stagefright/OMXPluginBase.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/media/stagefright/ShoutcastSource.h b/android-headers/10/frameworks/base/include/media/stagefright/ShoutcastSource.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/media/stagefright/ShoutcastSource.h rename to android-headers/10/frameworks/base/include/media/stagefright/ShoutcastSource.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/media/stagefright/StagefrightMediaScanner.h b/android-headers/10/frameworks/base/include/media/stagefright/StagefrightMediaScanner.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/media/stagefright/StagefrightMediaScanner.h rename to android-headers/10/frameworks/base/include/media/stagefright/StagefrightMediaScanner.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/media/stagefright/TimeSource.h b/android-headers/10/frameworks/base/include/media/stagefright/TimeSource.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/media/stagefright/TimeSource.h rename to android-headers/10/frameworks/base/include/media/stagefright/TimeSource.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/media/stagefright/Utils.h b/android-headers/10/frameworks/base/include/media/stagefright/Utils.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/media/stagefright/Utils.h rename to android-headers/10/frameworks/base/include/media/stagefright/Utils.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/media/stagefright/VideoRenderer.h b/android-headers/10/frameworks/base/include/media/stagefright/VideoRenderer.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/media/stagefright/VideoRenderer.h rename to android-headers/10/frameworks/base/include/media/stagefright/VideoRenderer.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/media/stagefright/foundation/AAtomizer.h b/android-headers/10/frameworks/base/include/media/stagefright/foundation/AAtomizer.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/media/stagefright/foundation/AAtomizer.h rename to android-headers/10/frameworks/base/include/media/stagefright/foundation/AAtomizer.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/media/stagefright/foundation/ABase.h b/android-headers/10/frameworks/base/include/media/stagefright/foundation/ABase.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/media/stagefright/foundation/ABase.h rename to android-headers/10/frameworks/base/include/media/stagefright/foundation/ABase.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/media/stagefright/foundation/ABitReader.h b/android-headers/10/frameworks/base/include/media/stagefright/foundation/ABitReader.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/media/stagefright/foundation/ABitReader.h rename to android-headers/10/frameworks/base/include/media/stagefright/foundation/ABitReader.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/media/stagefright/foundation/ABuffer.h b/android-headers/10/frameworks/base/include/media/stagefright/foundation/ABuffer.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/media/stagefright/foundation/ABuffer.h rename to android-headers/10/frameworks/base/include/media/stagefright/foundation/ABuffer.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/media/stagefright/foundation/ADebug.h b/android-headers/10/frameworks/base/include/media/stagefright/foundation/ADebug.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/media/stagefright/foundation/ADebug.h rename to android-headers/10/frameworks/base/include/media/stagefright/foundation/ADebug.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/media/stagefright/foundation/AHandler.h b/android-headers/10/frameworks/base/include/media/stagefright/foundation/AHandler.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/media/stagefright/foundation/AHandler.h rename to android-headers/10/frameworks/base/include/media/stagefright/foundation/AHandler.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/media/stagefright/foundation/AHandlerReflector.h b/android-headers/10/frameworks/base/include/media/stagefright/foundation/AHandlerReflector.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/media/stagefright/foundation/AHandlerReflector.h rename to android-headers/10/frameworks/base/include/media/stagefright/foundation/AHandlerReflector.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/media/stagefright/foundation/ALooper.h b/android-headers/10/frameworks/base/include/media/stagefright/foundation/ALooper.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/media/stagefright/foundation/ALooper.h rename to android-headers/10/frameworks/base/include/media/stagefright/foundation/ALooper.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/media/stagefright/foundation/ALooperRoster.h b/android-headers/10/frameworks/base/include/media/stagefright/foundation/ALooperRoster.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/media/stagefright/foundation/ALooperRoster.h rename to android-headers/10/frameworks/base/include/media/stagefright/foundation/ALooperRoster.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/media/stagefright/foundation/AMessage.h b/android-headers/10/frameworks/base/include/media/stagefright/foundation/AMessage.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/media/stagefright/foundation/AMessage.h rename to android-headers/10/frameworks/base/include/media/stagefright/foundation/AMessage.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/media/stagefright/foundation/AString.h b/android-headers/10/frameworks/base/include/media/stagefright/foundation/AString.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/media/stagefright/foundation/AString.h rename to android-headers/10/frameworks/base/include/media/stagefright/foundation/AString.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/media/stagefright/foundation/base64.h b/android-headers/10/frameworks/base/include/media/stagefright/foundation/base64.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/media/stagefright/foundation/base64.h rename to android-headers/10/frameworks/base/include/media/stagefright/foundation/base64.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/media/stagefright/foundation/hexdump.h b/android-headers/10/frameworks/base/include/media/stagefright/foundation/hexdump.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/media/stagefright/foundation/hexdump.h rename to android-headers/10/frameworks/base/include/media/stagefright/foundation/hexdump.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/media/stagefright/openmax/OMX_Audio.h b/android-headers/10/frameworks/base/include/media/stagefright/openmax/OMX_Audio.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/media/stagefright/openmax/OMX_Audio.h rename to android-headers/10/frameworks/base/include/media/stagefright/openmax/OMX_Audio.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/media/stagefright/openmax/OMX_Component.h b/android-headers/10/frameworks/base/include/media/stagefright/openmax/OMX_Component.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/media/stagefright/openmax/OMX_Component.h rename to android-headers/10/frameworks/base/include/media/stagefright/openmax/OMX_Component.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/media/stagefright/openmax/OMX_ContentPipe.h b/android-headers/10/frameworks/base/include/media/stagefright/openmax/OMX_ContentPipe.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/media/stagefright/openmax/OMX_ContentPipe.h rename to android-headers/10/frameworks/base/include/media/stagefright/openmax/OMX_ContentPipe.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/media/stagefright/openmax/OMX_Core.h b/android-headers/10/frameworks/base/include/media/stagefright/openmax/OMX_Core.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/media/stagefright/openmax/OMX_Core.h rename to android-headers/10/frameworks/base/include/media/stagefright/openmax/OMX_Core.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/media/stagefright/openmax/OMX_IVCommon.h b/android-headers/10/frameworks/base/include/media/stagefright/openmax/OMX_IVCommon.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/media/stagefright/openmax/OMX_IVCommon.h rename to android-headers/10/frameworks/base/include/media/stagefright/openmax/OMX_IVCommon.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/media/stagefright/openmax/OMX_Image.h b/android-headers/10/frameworks/base/include/media/stagefright/openmax/OMX_Image.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/media/stagefright/openmax/OMX_Image.h rename to android-headers/10/frameworks/base/include/media/stagefright/openmax/OMX_Image.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/media/stagefright/openmax/OMX_Index.h b/android-headers/10/frameworks/base/include/media/stagefright/openmax/OMX_Index.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/media/stagefright/openmax/OMX_Index.h rename to android-headers/10/frameworks/base/include/media/stagefright/openmax/OMX_Index.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/media/stagefright/openmax/OMX_Other.h b/android-headers/10/frameworks/base/include/media/stagefright/openmax/OMX_Other.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/media/stagefright/openmax/OMX_Other.h rename to android-headers/10/frameworks/base/include/media/stagefright/openmax/OMX_Other.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/media/stagefright/openmax/OMX_Types.h b/android-headers/10/frameworks/base/include/media/stagefright/openmax/OMX_Types.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/media/stagefright/openmax/OMX_Types.h rename to android-headers/10/frameworks/base/include/media/stagefright/openmax/OMX_Types.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/media/stagefright/openmax/OMX_Video.h b/android-headers/10/frameworks/base/include/media/stagefright/openmax/OMX_Video.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/media/stagefright/openmax/OMX_Video.h rename to android-headers/10/frameworks/base/include/media/stagefright/openmax/OMX_Video.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/media/thread_init.h b/android-headers/10/frameworks/base/include/media/thread_init.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/media/thread_init.h rename to android-headers/10/frameworks/base/include/media/thread_init.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/pim/EventRecurrence.h b/android-headers/10/frameworks/base/include/pim/EventRecurrence.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/pim/EventRecurrence.h rename to android-headers/10/frameworks/base/include/pim/EventRecurrence.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/private/README b/android-headers/10/frameworks/base/include/private/README similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/private/README rename to android-headers/10/frameworks/base/include/private/README diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/private/binder/Static.h b/android-headers/10/frameworks/base/include/private/binder/Static.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/private/binder/Static.h rename to android-headers/10/frameworks/base/include/private/binder/Static.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/private/binder/binder_module.h b/android-headers/10/frameworks/base/include/private/binder/binder_module.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/private/binder/binder_module.h rename to android-headers/10/frameworks/base/include/private/binder/binder_module.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/private/media/AudioEffectShared.h b/android-headers/10/frameworks/base/include/private/media/AudioEffectShared.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/private/media/AudioEffectShared.h rename to android-headers/10/frameworks/base/include/private/media/AudioEffectShared.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/private/media/AudioTrackShared.h b/android-headers/10/frameworks/base/include/private/media/AudioTrackShared.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/private/media/AudioTrackShared.h rename to android-headers/10/frameworks/base/include/private/media/AudioTrackShared.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/private/media/VideoFrame.h b/android-headers/10/frameworks/base/include/private/media/VideoFrame.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/private/media/VideoFrame.h rename to android-headers/10/frameworks/base/include/private/media/VideoFrame.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/private/opengles/gl_context.h b/android-headers/10/frameworks/base/include/private/opengles/gl_context.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/private/opengles/gl_context.h rename to android-headers/10/frameworks/base/include/private/opengles/gl_context.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/private/surfaceflinger/LayerState.h b/android-headers/10/frameworks/base/include/private/surfaceflinger/LayerState.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/private/surfaceflinger/LayerState.h rename to android-headers/10/frameworks/base/include/private/surfaceflinger/LayerState.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/private/surfaceflinger/SharedBufferStack.h b/android-headers/10/frameworks/base/include/private/surfaceflinger/SharedBufferStack.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/private/surfaceflinger/SharedBufferStack.h rename to android-headers/10/frameworks/base/include/private/surfaceflinger/SharedBufferStack.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/private/ui/RegionHelper.h b/android-headers/10/frameworks/base/include/private/ui/RegionHelper.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/private/ui/RegionHelper.h rename to android-headers/10/frameworks/base/include/private/ui/RegionHelper.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/private/ui/android_natives_priv.h b/android-headers/10/frameworks/base/include/private/ui/android_natives_priv.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/private/ui/android_natives_priv.h rename to android-headers/10/frameworks/base/include/private/ui/android_natives_priv.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/private/ui/sw_gralloc_handle.h b/android-headers/10/frameworks/base/include/private/ui/sw_gralloc_handle.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/private/ui/sw_gralloc_handle.h rename to android-headers/10/frameworks/base/include/private/ui/sw_gralloc_handle.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/private/utils/Static.h b/android-headers/10/frameworks/base/include/private/utils/Static.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/private/utils/Static.h rename to android-headers/10/frameworks/base/include/private/utils/Static.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/storage/IMountService.h b/android-headers/10/frameworks/base/include/storage/IMountService.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/storage/IMountService.h rename to android-headers/10/frameworks/base/include/storage/IMountService.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/storage/IMountServiceListener.h b/android-headers/10/frameworks/base/include/storage/IMountServiceListener.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/storage/IMountServiceListener.h rename to android-headers/10/frameworks/base/include/storage/IMountServiceListener.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/storage/IMountShutdownObserver.h b/android-headers/10/frameworks/base/include/storage/IMountShutdownObserver.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/storage/IMountShutdownObserver.h rename to android-headers/10/frameworks/base/include/storage/IMountShutdownObserver.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/storage/IObbActionListener.h b/android-headers/10/frameworks/base/include/storage/IObbActionListener.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/storage/IObbActionListener.h rename to android-headers/10/frameworks/base/include/storage/IObbActionListener.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/surfaceflinger/ISurface.h b/android-headers/10/frameworks/base/include/surfaceflinger/ISurface.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/surfaceflinger/ISurface.h rename to android-headers/10/frameworks/base/include/surfaceflinger/ISurface.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/surfaceflinger/ISurfaceComposer.h b/android-headers/10/frameworks/base/include/surfaceflinger/ISurfaceComposer.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/surfaceflinger/ISurfaceComposer.h rename to android-headers/10/frameworks/base/include/surfaceflinger/ISurfaceComposer.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/surfaceflinger/ISurfaceComposerClient.h b/android-headers/10/frameworks/base/include/surfaceflinger/ISurfaceComposerClient.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/surfaceflinger/ISurfaceComposerClient.h rename to android-headers/10/frameworks/base/include/surfaceflinger/ISurfaceComposerClient.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/surfaceflinger/Surface.h b/android-headers/10/frameworks/base/include/surfaceflinger/Surface.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/surfaceflinger/Surface.h rename to android-headers/10/frameworks/base/include/surfaceflinger/Surface.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/surfaceflinger/SurfaceComposerClient.h b/android-headers/10/frameworks/base/include/surfaceflinger/SurfaceComposerClient.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/surfaceflinger/SurfaceComposerClient.h rename to android-headers/10/frameworks/base/include/surfaceflinger/SurfaceComposerClient.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/tts/TtsEngine.h b/android-headers/10/frameworks/base/include/tts/TtsEngine.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/tts/TtsEngine.h rename to android-headers/10/frameworks/base/include/tts/TtsEngine.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/ui/DisplayInfo.h b/android-headers/10/frameworks/base/include/ui/DisplayInfo.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/ui/DisplayInfo.h rename to android-headers/10/frameworks/base/include/ui/DisplayInfo.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/ui/EGLNativeSurface.h b/android-headers/10/frameworks/base/include/ui/EGLNativeSurface.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/ui/EGLNativeSurface.h rename to android-headers/10/frameworks/base/include/ui/EGLNativeSurface.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/ui/EGLUtils.h b/android-headers/10/frameworks/base/include/ui/EGLUtils.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/ui/EGLUtils.h rename to android-headers/10/frameworks/base/include/ui/EGLUtils.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/ui/EventHub.h b/android-headers/10/frameworks/base/include/ui/EventHub.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/ui/EventHub.h rename to android-headers/10/frameworks/base/include/ui/EventHub.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/ui/FramebufferNativeWindow.h b/android-headers/10/frameworks/base/include/ui/FramebufferNativeWindow.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/ui/FramebufferNativeWindow.h rename to android-headers/10/frameworks/base/include/ui/FramebufferNativeWindow.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/ui/GraphicBuffer.h b/android-headers/10/frameworks/base/include/ui/GraphicBuffer.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/ui/GraphicBuffer.h rename to android-headers/10/frameworks/base/include/ui/GraphicBuffer.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/ui/GraphicBufferAllocator.h b/android-headers/10/frameworks/base/include/ui/GraphicBufferAllocator.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/ui/GraphicBufferAllocator.h rename to android-headers/10/frameworks/base/include/ui/GraphicBufferAllocator.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/ui/GraphicBufferMapper.h b/android-headers/10/frameworks/base/include/ui/GraphicBufferMapper.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/ui/GraphicBufferMapper.h rename to android-headers/10/frameworks/base/include/ui/GraphicBufferMapper.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/ui/GraphicLog.h b/android-headers/10/frameworks/base/include/ui/GraphicLog.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/ui/GraphicLog.h rename to android-headers/10/frameworks/base/include/ui/GraphicLog.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/ui/IOverlay.h b/android-headers/10/frameworks/base/include/ui/IOverlay.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/ui/IOverlay.h rename to android-headers/10/frameworks/base/include/ui/IOverlay.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/ui/Input.h b/android-headers/10/frameworks/base/include/ui/Input.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/ui/Input.h rename to android-headers/10/frameworks/base/include/ui/Input.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/ui/InputDispatcher.h b/android-headers/10/frameworks/base/include/ui/InputDispatcher.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/ui/InputDispatcher.h rename to android-headers/10/frameworks/base/include/ui/InputDispatcher.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/ui/InputManager.h b/android-headers/10/frameworks/base/include/ui/InputManager.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/ui/InputManager.h rename to android-headers/10/frameworks/base/include/ui/InputManager.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/ui/InputReader.h b/android-headers/10/frameworks/base/include/ui/InputReader.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/ui/InputReader.h rename to android-headers/10/frameworks/base/include/ui/InputReader.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/ui/InputTransport.h b/android-headers/10/frameworks/base/include/ui/InputTransport.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/ui/InputTransport.h rename to android-headers/10/frameworks/base/include/ui/InputTransport.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/ui/KeyCharacterMap.h b/android-headers/10/frameworks/base/include/ui/KeyCharacterMap.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/ui/KeyCharacterMap.h rename to android-headers/10/frameworks/base/include/ui/KeyCharacterMap.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/ui/KeycodeLabels.h b/android-headers/10/frameworks/base/include/ui/KeycodeLabels.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/ui/KeycodeLabels.h rename to android-headers/10/frameworks/base/include/ui/KeycodeLabels.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/ui/Overlay.h b/android-headers/10/frameworks/base/include/ui/Overlay.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/ui/Overlay.h rename to android-headers/10/frameworks/base/include/ui/Overlay.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/ui/PixelFormat.h b/android-headers/10/frameworks/base/include/ui/PixelFormat.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/ui/PixelFormat.h rename to android-headers/10/frameworks/base/include/ui/PixelFormat.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/ui/Point.h b/android-headers/10/frameworks/base/include/ui/Point.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/ui/Point.h rename to android-headers/10/frameworks/base/include/ui/Point.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/ui/PowerManager.h b/android-headers/10/frameworks/base/include/ui/PowerManager.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/ui/PowerManager.h rename to android-headers/10/frameworks/base/include/ui/PowerManager.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/ui/Rect.h b/android-headers/10/frameworks/base/include/ui/Rect.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/ui/Rect.h rename to android-headers/10/frameworks/base/include/ui/Rect.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/ui/Region.h b/android-headers/10/frameworks/base/include/ui/Region.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/ui/Region.h rename to android-headers/10/frameworks/base/include/ui/Region.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/ui/android_native_buffer.h b/android-headers/10/frameworks/base/include/ui/android_native_buffer.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/ui/android_native_buffer.h rename to android-headers/10/frameworks/base/include/ui/android_native_buffer.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/ui/egl/android_natives.h b/android-headers/10/frameworks/base/include/ui/egl/android_natives.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/ui/egl/android_natives.h rename to android-headers/10/frameworks/base/include/ui/egl/android_natives.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/utils/Asset.h b/android-headers/10/frameworks/base/include/utils/Asset.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/utils/Asset.h rename to android-headers/10/frameworks/base/include/utils/Asset.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/utils/AssetDir.h b/android-headers/10/frameworks/base/include/utils/AssetDir.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/utils/AssetDir.h rename to android-headers/10/frameworks/base/include/utils/AssetDir.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/utils/AssetManager.h b/android-headers/10/frameworks/base/include/utils/AssetManager.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/utils/AssetManager.h rename to android-headers/10/frameworks/base/include/utils/AssetManager.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/utils/Atomic.h b/android-headers/10/frameworks/base/include/utils/Atomic.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/utils/Atomic.h rename to android-headers/10/frameworks/base/include/utils/Atomic.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/utils/BackupHelpers.h b/android-headers/10/frameworks/base/include/utils/BackupHelpers.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/utils/BackupHelpers.h rename to android-headers/10/frameworks/base/include/utils/BackupHelpers.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/utils/BitSet.h b/android-headers/10/frameworks/base/include/utils/BitSet.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/utils/BitSet.h rename to android-headers/10/frameworks/base/include/utils/BitSet.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/utils/BufferedTextOutput.h b/android-headers/10/frameworks/base/include/utils/BufferedTextOutput.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/utils/BufferedTextOutput.h rename to android-headers/10/frameworks/base/include/utils/BufferedTextOutput.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/utils/ByteOrder.h b/android-headers/10/frameworks/base/include/utils/ByteOrder.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/utils/ByteOrder.h rename to android-headers/10/frameworks/base/include/utils/ByteOrder.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/utils/CallStack.h b/android-headers/10/frameworks/base/include/utils/CallStack.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/utils/CallStack.h rename to android-headers/10/frameworks/base/include/utils/CallStack.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/utils/Debug.h b/android-headers/10/frameworks/base/include/utils/Debug.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/utils/Debug.h rename to android-headers/10/frameworks/base/include/utils/Debug.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/utils/Endian.h b/android-headers/10/frameworks/base/include/utils/Endian.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/utils/Endian.h rename to android-headers/10/frameworks/base/include/utils/Endian.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/utils/Errors.h b/android-headers/10/frameworks/base/include/utils/Errors.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/utils/Errors.h rename to android-headers/10/frameworks/base/include/utils/Errors.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/utils/FileMap.h b/android-headers/10/frameworks/base/include/utils/FileMap.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/utils/FileMap.h rename to android-headers/10/frameworks/base/include/utils/FileMap.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/utils/Flattenable.h b/android-headers/10/frameworks/base/include/utils/Flattenable.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/utils/Flattenable.h rename to android-headers/10/frameworks/base/include/utils/Flattenable.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/utils/KeyedVector.h b/android-headers/10/frameworks/base/include/utils/KeyedVector.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/utils/KeyedVector.h rename to android-headers/10/frameworks/base/include/utils/KeyedVector.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/utils/List.h b/android-headers/10/frameworks/base/include/utils/List.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/utils/List.h rename to android-headers/10/frameworks/base/include/utils/List.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/utils/Log.h b/android-headers/10/frameworks/base/include/utils/Log.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/utils/Log.h rename to android-headers/10/frameworks/base/include/utils/Log.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/utils/Looper.h b/android-headers/10/frameworks/base/include/utils/Looper.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/utils/Looper.h rename to android-headers/10/frameworks/base/include/utils/Looper.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/utils/ObbFile.h b/android-headers/10/frameworks/base/include/utils/ObbFile.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/utils/ObbFile.h rename to android-headers/10/frameworks/base/include/utils/ObbFile.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/utils/PackageRedirectionMap.h b/android-headers/10/frameworks/base/include/utils/PackageRedirectionMap.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/utils/PackageRedirectionMap.h rename to android-headers/10/frameworks/base/include/utils/PackageRedirectionMap.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/utils/Pool.h b/android-headers/10/frameworks/base/include/utils/Pool.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/utils/Pool.h rename to android-headers/10/frameworks/base/include/utils/Pool.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/utils/RefBase.h b/android-headers/10/frameworks/base/include/utils/RefBase.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/utils/RefBase.h rename to android-headers/10/frameworks/base/include/utils/RefBase.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/utils/ResourceTypes.h b/android-headers/10/frameworks/base/include/utils/ResourceTypes.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/utils/ResourceTypes.h rename to android-headers/10/frameworks/base/include/utils/ResourceTypes.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/utils/SharedBuffer.h b/android-headers/10/frameworks/base/include/utils/SharedBuffer.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/utils/SharedBuffer.h rename to android-headers/10/frameworks/base/include/utils/SharedBuffer.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/utils/Singleton.h b/android-headers/10/frameworks/base/include/utils/Singleton.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/utils/Singleton.h rename to android-headers/10/frameworks/base/include/utils/Singleton.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/utils/SortedVector.h b/android-headers/10/frameworks/base/include/utils/SortedVector.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/utils/SortedVector.h rename to android-headers/10/frameworks/base/include/utils/SortedVector.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/utils/StopWatch.h b/android-headers/10/frameworks/base/include/utils/StopWatch.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/utils/StopWatch.h rename to android-headers/10/frameworks/base/include/utils/StopWatch.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/utils/StreamingZipInflater.h b/android-headers/10/frameworks/base/include/utils/StreamingZipInflater.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/utils/StreamingZipInflater.h rename to android-headers/10/frameworks/base/include/utils/StreamingZipInflater.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/utils/String16.h b/android-headers/10/frameworks/base/include/utils/String16.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/utils/String16.h rename to android-headers/10/frameworks/base/include/utils/String16.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/utils/String8.h b/android-headers/10/frameworks/base/include/utils/String8.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/utils/String8.h rename to android-headers/10/frameworks/base/include/utils/String8.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/utils/StringArray.h b/android-headers/10/frameworks/base/include/utils/StringArray.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/utils/StringArray.h rename to android-headers/10/frameworks/base/include/utils/StringArray.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/utils/SystemClock.h b/android-headers/10/frameworks/base/include/utils/SystemClock.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/utils/SystemClock.h rename to android-headers/10/frameworks/base/include/utils/SystemClock.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/utils/TextOutput.h b/android-headers/10/frameworks/base/include/utils/TextOutput.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/utils/TextOutput.h rename to android-headers/10/frameworks/base/include/utils/TextOutput.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/utils/Timers.h b/android-headers/10/frameworks/base/include/utils/Timers.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/utils/Timers.h rename to android-headers/10/frameworks/base/include/utils/Timers.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/utils/TypeHelpers.h b/android-headers/10/frameworks/base/include/utils/TypeHelpers.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/utils/TypeHelpers.h rename to android-headers/10/frameworks/base/include/utils/TypeHelpers.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/utils/Vector.h b/android-headers/10/frameworks/base/include/utils/Vector.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/utils/Vector.h rename to android-headers/10/frameworks/base/include/utils/Vector.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/utils/VectorImpl.h b/android-headers/10/frameworks/base/include/utils/VectorImpl.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/utils/VectorImpl.h rename to android-headers/10/frameworks/base/include/utils/VectorImpl.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/utils/ZipEntry.h b/android-headers/10/frameworks/base/include/utils/ZipEntry.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/utils/ZipEntry.h rename to android-headers/10/frameworks/base/include/utils/ZipEntry.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/utils/ZipFile.h b/android-headers/10/frameworks/base/include/utils/ZipFile.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/utils/ZipFile.h rename to android-headers/10/frameworks/base/include/utils/ZipFile.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/utils/ZipFileCRO.h b/android-headers/10/frameworks/base/include/utils/ZipFileCRO.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/utils/ZipFileCRO.h rename to android-headers/10/frameworks/base/include/utils/ZipFileCRO.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/utils/ZipFileRO.h b/android-headers/10/frameworks/base/include/utils/ZipFileRO.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/utils/ZipFileRO.h rename to android-headers/10/frameworks/base/include/utils/ZipFileRO.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/utils/ZipUtils.h b/android-headers/10/frameworks/base/include/utils/ZipUtils.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/utils/ZipUtils.h rename to android-headers/10/frameworks/base/include/utils/ZipUtils.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/utils/ashmem.h b/android-headers/10/frameworks/base/include/utils/ashmem.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/utils/ashmem.h rename to android-headers/10/frameworks/base/include/utils/ashmem.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/utils/misc.h b/android-headers/10/frameworks/base/include/utils/misc.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/utils/misc.h rename to android-headers/10/frameworks/base/include/utils/misc.h diff --git a/android-headers/android-headers-gingerbread/frameworks/base/include/utils/threads.h b/android-headers/10/frameworks/base/include/utils/threads.h similarity index 100% rename from android-headers/android-headers-gingerbread/frameworks/base/include/utils/threads.h rename to android-headers/10/frameworks/base/include/utils/threads.h diff --git a/android-headers/android-headers-gingerbread/hardware/libhardware/include/hardware/copybit.h b/android-headers/10/hardware/libhardware/include/hardware/copybit.h similarity index 100% rename from android-headers/android-headers-gingerbread/hardware/libhardware/include/hardware/copybit.h rename to android-headers/10/hardware/libhardware/include/hardware/copybit.h diff --git a/android-headers/android-headers-gingerbread/hardware/libhardware/include/hardware/gps.h b/android-headers/10/hardware/libhardware/include/hardware/gps.h similarity index 100% rename from android-headers/android-headers-gingerbread/hardware/libhardware/include/hardware/gps.h rename to android-headers/10/hardware/libhardware/include/hardware/gps.h diff --git a/android-headers/android-headers-gingerbread/hardware/libhardware/include/hardware/gralloc.h b/android-headers/10/hardware/libhardware/include/hardware/gralloc.h similarity index 100% rename from android-headers/android-headers-gingerbread/hardware/libhardware/include/hardware/gralloc.h rename to android-headers/10/hardware/libhardware/include/hardware/gralloc.h diff --git a/android-headers/android-headers-gingerbread/hardware/libhardware/include/hardware/hardware.h b/android-headers/10/hardware/libhardware/include/hardware/hardware.h similarity index 100% rename from android-headers/android-headers-gingerbread/hardware/libhardware/include/hardware/hardware.h rename to android-headers/10/hardware/libhardware/include/hardware/hardware.h diff --git a/android-headers/android-headers-gingerbread/hardware/libhardware/include/hardware/lights.h b/android-headers/10/hardware/libhardware/include/hardware/lights.h similarity index 100% rename from android-headers/android-headers-gingerbread/hardware/libhardware/include/hardware/lights.h rename to android-headers/10/hardware/libhardware/include/hardware/lights.h diff --git a/android-headers/android-headers-gingerbread/hardware/libhardware/include/hardware/overlay.h b/android-headers/10/hardware/libhardware/include/hardware/overlay.h similarity index 100% rename from android-headers/android-headers-gingerbread/hardware/libhardware/include/hardware/overlay.h rename to android-headers/10/hardware/libhardware/include/hardware/overlay.h diff --git a/android-headers/android-headers-gingerbread/hardware/libhardware/include/hardware/qemud.h b/android-headers/10/hardware/libhardware/include/hardware/qemud.h similarity index 100% rename from android-headers/android-headers-gingerbread/hardware/libhardware/include/hardware/qemud.h rename to android-headers/10/hardware/libhardware/include/hardware/qemud.h diff --git a/android-headers/android-headers-gingerbread/hardware/libhardware/include/hardware/sensors.h b/android-headers/10/hardware/libhardware/include/hardware/sensors.h similarity index 100% rename from android-headers/android-headers-gingerbread/hardware/libhardware/include/hardware/sensors.h rename to android-headers/10/hardware/libhardware/include/hardware/sensors.h diff --git a/android-headers/android-headers-gingerbread/hardware/libhardware/include/hardware/sensors_deprecated.h b/android-headers/10/hardware/libhardware/include/hardware/sensors_deprecated.h similarity index 100% rename from android-headers/android-headers-gingerbread/hardware/libhardware/include/hardware/sensors_deprecated.h rename to android-headers/10/hardware/libhardware/include/hardware/sensors_deprecated.h diff --git a/android-headers/android-headers-gingerbread/system/core/include/acc/acc.h b/android-headers/10/system/core/include/acc/acc.h similarity index 100% rename from android-headers/android-headers-gingerbread/system/core/include/acc/acc.h rename to android-headers/10/system/core/include/acc/acc.h diff --git a/android-headers/android-headers-gingerbread/system/core/include/android/log.h b/android-headers/10/system/core/include/android/log.h similarity index 100% rename from android-headers/android-headers-gingerbread/system/core/include/android/log.h rename to android-headers/10/system/core/include/android/log.h diff --git a/android-headers/android-headers-gingerbread/system/core/include/arch/darwin-x86/AndroidConfig.h b/android-headers/10/system/core/include/arch/darwin-x86/AndroidConfig.h similarity index 100% rename from android-headers/android-headers-gingerbread/system/core/include/arch/darwin-x86/AndroidConfig.h rename to android-headers/10/system/core/include/arch/darwin-x86/AndroidConfig.h diff --git a/android-headers/android-headers-gingerbread/system/core/include/arch/freebsd-x86/AndroidConfig.h b/android-headers/10/system/core/include/arch/freebsd-x86/AndroidConfig.h similarity index 100% rename from android-headers/android-headers-gingerbread/system/core/include/arch/freebsd-x86/AndroidConfig.h rename to android-headers/10/system/core/include/arch/freebsd-x86/AndroidConfig.h diff --git a/android-headers/android-headers-gingerbread/system/core/include/arch/linux-arm/AndroidConfig.h b/android-headers/10/system/core/include/arch/linux-arm/AndroidConfig.h similarity index 100% rename from android-headers/android-headers-gingerbread/system/core/include/arch/linux-arm/AndroidConfig.h rename to android-headers/10/system/core/include/arch/linux-arm/AndroidConfig.h diff --git a/android-headers/android-headers-gingerbread/system/core/include/arch/linux-sh/AndroidConfig.h b/android-headers/10/system/core/include/arch/linux-sh/AndroidConfig.h similarity index 100% rename from android-headers/android-headers-gingerbread/system/core/include/arch/linux-sh/AndroidConfig.h rename to android-headers/10/system/core/include/arch/linux-sh/AndroidConfig.h diff --git a/android-headers/android-headers-gingerbread/system/core/include/arch/linux-x86/AndroidConfig.h b/android-headers/10/system/core/include/arch/linux-x86/AndroidConfig.h similarity index 100% rename from android-headers/android-headers-gingerbread/system/core/include/arch/linux-x86/AndroidConfig.h rename to android-headers/10/system/core/include/arch/linux-x86/AndroidConfig.h diff --git a/android-headers/android-headers-gingerbread/system/core/include/arch/target_linux-x86/AndroidConfig.h b/android-headers/10/system/core/include/arch/target_linux-x86/AndroidConfig.h similarity index 100% rename from android-headers/android-headers-gingerbread/system/core/include/arch/target_linux-x86/AndroidConfig.h rename to android-headers/10/system/core/include/arch/target_linux-x86/AndroidConfig.h diff --git a/android-headers/android-headers-gingerbread/system/core/include/arch/windows/AndroidConfig.h b/android-headers/10/system/core/include/arch/windows/AndroidConfig.h similarity index 100% rename from android-headers/android-headers-gingerbread/system/core/include/arch/windows/AndroidConfig.h rename to android-headers/10/system/core/include/arch/windows/AndroidConfig.h diff --git a/android-headers/android-headers-gingerbread/system/core/include/ctest/ctest.h b/android-headers/10/system/core/include/ctest/ctest.h similarity index 100% rename from android-headers/android-headers-gingerbread/system/core/include/ctest/ctest.h rename to android-headers/10/system/core/include/ctest/ctest.h diff --git a/android-headers/android-headers-gingerbread/system/core/include/cutils/abort_socket.h b/android-headers/10/system/core/include/cutils/abort_socket.h similarity index 100% rename from android-headers/android-headers-gingerbread/system/core/include/cutils/abort_socket.h rename to android-headers/10/system/core/include/cutils/abort_socket.h diff --git a/android-headers/android-headers-gingerbread/system/core/include/cutils/array.h b/android-headers/10/system/core/include/cutils/array.h similarity index 100% rename from android-headers/android-headers-gingerbread/system/core/include/cutils/array.h rename to android-headers/10/system/core/include/cutils/array.h diff --git a/android-headers/android-headers-gingerbread/system/core/include/cutils/ashmem.h b/android-headers/10/system/core/include/cutils/ashmem.h similarity index 100% rename from android-headers/android-headers-gingerbread/system/core/include/cutils/ashmem.h rename to android-headers/10/system/core/include/cutils/ashmem.h diff --git a/android-headers/android-headers-gingerbread/system/core/include/cutils/atomic-arm.h b/android-headers/10/system/core/include/cutils/atomic-arm.h similarity index 100% rename from android-headers/android-headers-gingerbread/system/core/include/cutils/atomic-arm.h rename to android-headers/10/system/core/include/cutils/atomic-arm.h diff --git a/android-headers/android-headers-gingerbread/system/core/include/cutils/atomic-inline.h b/android-headers/10/system/core/include/cutils/atomic-inline.h similarity index 100% rename from android-headers/android-headers-gingerbread/system/core/include/cutils/atomic-inline.h rename to android-headers/10/system/core/include/cutils/atomic-inline.h diff --git a/android-headers/android-headers-gingerbread/system/core/include/cutils/atomic-x86.h b/android-headers/10/system/core/include/cutils/atomic-x86.h similarity index 100% rename from android-headers/android-headers-gingerbread/system/core/include/cutils/atomic-x86.h rename to android-headers/10/system/core/include/cutils/atomic-x86.h diff --git a/android-headers/android-headers-gingerbread/system/core/include/cutils/atomic.h b/android-headers/10/system/core/include/cutils/atomic.h similarity index 100% rename from android-headers/android-headers-gingerbread/system/core/include/cutils/atomic.h rename to android-headers/10/system/core/include/cutils/atomic.h diff --git a/android-headers/android-headers-gingerbread/system/core/include/cutils/compiler.h b/android-headers/10/system/core/include/cutils/compiler.h similarity index 100% rename from android-headers/android-headers-gingerbread/system/core/include/cutils/compiler.h rename to android-headers/10/system/core/include/cutils/compiler.h diff --git a/android-headers/android-headers-gingerbread/system/core/include/cutils/config_utils.h b/android-headers/10/system/core/include/cutils/config_utils.h similarity index 100% rename from android-headers/android-headers-gingerbread/system/core/include/cutils/config_utils.h rename to android-headers/10/system/core/include/cutils/config_utils.h diff --git a/android-headers/android-headers-gingerbread/system/core/include/cutils/cpu_info.h b/android-headers/10/system/core/include/cutils/cpu_info.h similarity index 100% rename from android-headers/android-headers-gingerbread/system/core/include/cutils/cpu_info.h rename to android-headers/10/system/core/include/cutils/cpu_info.h diff --git a/android-headers/android-headers-gingerbread/system/core/include/cutils/dir_hash.h b/android-headers/10/system/core/include/cutils/dir_hash.h similarity index 100% rename from android-headers/android-headers-gingerbread/system/core/include/cutils/dir_hash.h rename to android-headers/10/system/core/include/cutils/dir_hash.h diff --git a/android-headers/android-headers-gingerbread/system/core/include/cutils/event_tag_map.h b/android-headers/10/system/core/include/cutils/event_tag_map.h similarity index 100% rename from android-headers/android-headers-gingerbread/system/core/include/cutils/event_tag_map.h rename to android-headers/10/system/core/include/cutils/event_tag_map.h diff --git a/android-headers/android-headers-gingerbread/system/core/include/cutils/hashmap.h b/android-headers/10/system/core/include/cutils/hashmap.h similarity index 100% rename from android-headers/android-headers-gingerbread/system/core/include/cutils/hashmap.h rename to android-headers/10/system/core/include/cutils/hashmap.h diff --git a/android-headers/android-headers-gingerbread/system/core/include/cutils/iosched_policy.h b/android-headers/10/system/core/include/cutils/iosched_policy.h similarity index 100% rename from android-headers/android-headers-gingerbread/system/core/include/cutils/iosched_policy.h rename to android-headers/10/system/core/include/cutils/iosched_policy.h diff --git a/android-headers/android-headers-gingerbread/system/core/include/cutils/jstring.h b/android-headers/10/system/core/include/cutils/jstring.h similarity index 100% rename from android-headers/android-headers-gingerbread/system/core/include/cutils/jstring.h rename to android-headers/10/system/core/include/cutils/jstring.h diff --git a/android-headers/android-headers-gingerbread/system/core/include/cutils/log.h b/android-headers/10/system/core/include/cutils/log.h similarity index 100% rename from android-headers/android-headers-gingerbread/system/core/include/cutils/log.h rename to android-headers/10/system/core/include/cutils/log.h diff --git a/android-headers/android-headers-gingerbread/system/core/include/cutils/logd.h b/android-headers/10/system/core/include/cutils/logd.h similarity index 100% rename from android-headers/android-headers-gingerbread/system/core/include/cutils/logd.h rename to android-headers/10/system/core/include/cutils/logd.h diff --git a/android-headers/android-headers-gingerbread/system/core/include/cutils/logger.h b/android-headers/10/system/core/include/cutils/logger.h similarity index 100% rename from android-headers/android-headers-gingerbread/system/core/include/cutils/logger.h rename to android-headers/10/system/core/include/cutils/logger.h diff --git a/android-headers/android-headers-gingerbread/system/core/include/cutils/logprint.h b/android-headers/10/system/core/include/cutils/logprint.h similarity index 100% rename from android-headers/android-headers-gingerbread/system/core/include/cutils/logprint.h rename to android-headers/10/system/core/include/cutils/logprint.h diff --git a/android-headers/android-headers-gingerbread/system/core/include/cutils/memory.h b/android-headers/10/system/core/include/cutils/memory.h similarity index 100% rename from android-headers/android-headers-gingerbread/system/core/include/cutils/memory.h rename to android-headers/10/system/core/include/cutils/memory.h diff --git a/android-headers/android-headers-gingerbread/system/core/include/cutils/misc.h b/android-headers/10/system/core/include/cutils/misc.h similarity index 100% rename from android-headers/android-headers-gingerbread/system/core/include/cutils/misc.h rename to android-headers/10/system/core/include/cutils/misc.h diff --git a/android-headers/android-headers-gingerbread/system/core/include/cutils/mq.h b/android-headers/10/system/core/include/cutils/mq.h similarity index 100% rename from android-headers/android-headers-gingerbread/system/core/include/cutils/mq.h rename to android-headers/10/system/core/include/cutils/mq.h diff --git a/android-headers/android-headers-gingerbread/system/core/include/cutils/mspace.h b/android-headers/10/system/core/include/cutils/mspace.h similarity index 100% rename from android-headers/android-headers-gingerbread/system/core/include/cutils/mspace.h rename to android-headers/10/system/core/include/cutils/mspace.h diff --git a/android-headers/android-headers-gingerbread/system/core/include/cutils/native_handle.h b/android-headers/10/system/core/include/cutils/native_handle.h similarity index 100% rename from android-headers/android-headers-gingerbread/system/core/include/cutils/native_handle.h rename to android-headers/10/system/core/include/cutils/native_handle.h diff --git a/android-headers/android-headers-gingerbread/system/core/include/cutils/open_memstream.h b/android-headers/10/system/core/include/cutils/open_memstream.h similarity index 100% rename from android-headers/android-headers-gingerbread/system/core/include/cutils/open_memstream.h rename to android-headers/10/system/core/include/cutils/open_memstream.h diff --git a/android-headers/android-headers-gingerbread/system/core/include/cutils/process_name.h b/android-headers/10/system/core/include/cutils/process_name.h similarity index 100% rename from android-headers/android-headers-gingerbread/system/core/include/cutils/process_name.h rename to android-headers/10/system/core/include/cutils/process_name.h diff --git a/android-headers/android-headers-gingerbread/system/core/include/cutils/properties.h b/android-headers/10/system/core/include/cutils/properties.h similarity index 100% rename from android-headers/android-headers-gingerbread/system/core/include/cutils/properties.h rename to android-headers/10/system/core/include/cutils/properties.h diff --git a/android-headers/android-headers-gingerbread/system/core/include/cutils/record_stream.h b/android-headers/10/system/core/include/cutils/record_stream.h similarity index 100% rename from android-headers/android-headers-gingerbread/system/core/include/cutils/record_stream.h rename to android-headers/10/system/core/include/cutils/record_stream.h diff --git a/android-headers/android-headers-gingerbread/system/core/include/cutils/sched_policy.h b/android-headers/10/system/core/include/cutils/sched_policy.h similarity index 100% rename from android-headers/android-headers-gingerbread/system/core/include/cutils/sched_policy.h rename to android-headers/10/system/core/include/cutils/sched_policy.h diff --git a/android-headers/android-headers-gingerbread/system/core/include/cutils/selector.h b/android-headers/10/system/core/include/cutils/selector.h similarity index 100% rename from android-headers/android-headers-gingerbread/system/core/include/cutils/selector.h rename to android-headers/10/system/core/include/cutils/selector.h diff --git a/android-headers/android-headers-gingerbread/system/core/include/cutils/sockets.h b/android-headers/10/system/core/include/cutils/sockets.h similarity index 100% rename from android-headers/android-headers-gingerbread/system/core/include/cutils/sockets.h rename to android-headers/10/system/core/include/cutils/sockets.h diff --git a/android-headers/android-headers-gingerbread/system/core/include/cutils/threads.h b/android-headers/10/system/core/include/cutils/threads.h similarity index 100% rename from android-headers/android-headers-gingerbread/system/core/include/cutils/threads.h rename to android-headers/10/system/core/include/cutils/threads.h diff --git a/android-headers/android-headers-gingerbread/system/core/include/cutils/tztime.h b/android-headers/10/system/core/include/cutils/tztime.h similarity index 100% rename from android-headers/android-headers-gingerbread/system/core/include/cutils/tztime.h rename to android-headers/10/system/core/include/cutils/tztime.h diff --git a/android-headers/android-headers-gingerbread/system/core/include/cutils/uio.h b/android-headers/10/system/core/include/cutils/uio.h similarity index 100% rename from android-headers/android-headers-gingerbread/system/core/include/cutils/uio.h rename to android-headers/10/system/core/include/cutils/uio.h diff --git a/android-headers/android-headers-gingerbread/system/core/include/cutils/zygote.h b/android-headers/10/system/core/include/cutils/zygote.h similarity index 100% rename from android-headers/android-headers-gingerbread/system/core/include/cutils/zygote.h rename to android-headers/10/system/core/include/cutils/zygote.h diff --git a/android-headers/android-headers-gingerbread/system/core/include/diskconfig/diskconfig.h b/android-headers/10/system/core/include/diskconfig/diskconfig.h similarity index 100% rename from android-headers/android-headers-gingerbread/system/core/include/diskconfig/diskconfig.h rename to android-headers/10/system/core/include/diskconfig/diskconfig.h diff --git a/android-headers/android-headers-gingerbread/system/core/include/mincrypt/rsa.h b/android-headers/10/system/core/include/mincrypt/rsa.h similarity index 100% rename from android-headers/android-headers-gingerbread/system/core/include/mincrypt/rsa.h rename to android-headers/10/system/core/include/mincrypt/rsa.h diff --git a/android-headers/android-headers-gingerbread/system/core/include/mincrypt/sha.h b/android-headers/10/system/core/include/mincrypt/sha.h similarity index 100% rename from android-headers/android-headers-gingerbread/system/core/include/mincrypt/sha.h rename to android-headers/10/system/core/include/mincrypt/sha.h diff --git a/android-headers/android-headers-gingerbread/system/core/include/pixelflinger/format.h b/android-headers/10/system/core/include/pixelflinger/format.h similarity index 100% rename from android-headers/android-headers-gingerbread/system/core/include/pixelflinger/format.h rename to android-headers/10/system/core/include/pixelflinger/format.h diff --git a/android-headers/android-headers-gingerbread/system/core/include/pixelflinger/pixelflinger.h b/android-headers/10/system/core/include/pixelflinger/pixelflinger.h similarity index 100% rename from android-headers/android-headers-gingerbread/system/core/include/pixelflinger/pixelflinger.h rename to android-headers/10/system/core/include/pixelflinger/pixelflinger.h diff --git a/android-headers/android-headers-gingerbread/system/core/include/private/android_filesystem_config.h b/android-headers/10/system/core/include/private/android_filesystem_config.h similarity index 100% rename from android-headers/android-headers-gingerbread/system/core/include/private/android_filesystem_config.h rename to android-headers/10/system/core/include/private/android_filesystem_config.h diff --git a/android-headers/android-headers-gingerbread/system/core/include/private/pixelflinger/ggl_context.h b/android-headers/10/system/core/include/private/pixelflinger/ggl_context.h similarity index 100% rename from android-headers/android-headers-gingerbread/system/core/include/private/pixelflinger/ggl_context.h rename to android-headers/10/system/core/include/private/pixelflinger/ggl_context.h diff --git a/android-headers/android-headers-gingerbread/system/core/include/private/pixelflinger/ggl_fixed.h b/android-headers/10/system/core/include/private/pixelflinger/ggl_fixed.h similarity index 100% rename from android-headers/android-headers-gingerbread/system/core/include/private/pixelflinger/ggl_fixed.h rename to android-headers/10/system/core/include/private/pixelflinger/ggl_fixed.h diff --git a/android-headers/android-headers-gingerbread/system/core/include/reboot/reboot.h b/android-headers/10/system/core/include/reboot/reboot.h similarity index 100% rename from android-headers/android-headers-gingerbread/system/core/include/reboot/reboot.h rename to android-headers/10/system/core/include/reboot/reboot.h diff --git a/android-headers/android-headers-gingerbread/system/core/include/sysutils/FrameworkClient.h b/android-headers/10/system/core/include/sysutils/FrameworkClient.h similarity index 100% rename from android-headers/android-headers-gingerbread/system/core/include/sysutils/FrameworkClient.h rename to android-headers/10/system/core/include/sysutils/FrameworkClient.h diff --git a/android-headers/android-headers-gingerbread/system/core/include/sysutils/FrameworkCommand.h b/android-headers/10/system/core/include/sysutils/FrameworkCommand.h similarity index 100% rename from android-headers/android-headers-gingerbread/system/core/include/sysutils/FrameworkCommand.h rename to android-headers/10/system/core/include/sysutils/FrameworkCommand.h diff --git a/android-headers/android-headers-gingerbread/system/core/include/sysutils/FrameworkListener.h b/android-headers/10/system/core/include/sysutils/FrameworkListener.h similarity index 100% rename from android-headers/android-headers-gingerbread/system/core/include/sysutils/FrameworkListener.h rename to android-headers/10/system/core/include/sysutils/FrameworkListener.h diff --git a/android-headers/android-headers-gingerbread/system/core/include/sysutils/NetlinkEvent.h b/android-headers/10/system/core/include/sysutils/NetlinkEvent.h similarity index 100% rename from android-headers/android-headers-gingerbread/system/core/include/sysutils/NetlinkEvent.h rename to android-headers/10/system/core/include/sysutils/NetlinkEvent.h diff --git a/android-headers/android-headers-gingerbread/system/core/include/sysutils/NetlinkListener.h b/android-headers/10/system/core/include/sysutils/NetlinkListener.h similarity index 100% rename from android-headers/android-headers-gingerbread/system/core/include/sysutils/NetlinkListener.h rename to android-headers/10/system/core/include/sysutils/NetlinkListener.h diff --git a/android-headers/android-headers-gingerbread/system/core/include/sysutils/ServiceManager.h b/android-headers/10/system/core/include/sysutils/ServiceManager.h similarity index 100% rename from android-headers/android-headers-gingerbread/system/core/include/sysutils/ServiceManager.h rename to android-headers/10/system/core/include/sysutils/ServiceManager.h diff --git a/android-headers/android-headers-gingerbread/system/core/include/sysutils/SocketClient.h b/android-headers/10/system/core/include/sysutils/SocketClient.h similarity index 100% rename from android-headers/android-headers-gingerbread/system/core/include/sysutils/SocketClient.h rename to android-headers/10/system/core/include/sysutils/SocketClient.h diff --git a/android-headers/android-headers-gingerbread/system/core/include/sysutils/SocketListener.h b/android-headers/10/system/core/include/sysutils/SocketListener.h similarity index 100% rename from android-headers/android-headers-gingerbread/system/core/include/sysutils/SocketListener.h rename to android-headers/10/system/core/include/sysutils/SocketListener.h diff --git a/android-headers/android-headers-gingerbread/system/core/include/zipfile/zipfile.h b/android-headers/10/system/core/include/zipfile/zipfile.h similarity index 100% rename from android-headers/android-headers-gingerbread/system/core/include/zipfile/zipfile.h rename to android-headers/10/system/core/include/zipfile/zipfile.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/android_runtime/ActivityManager.h b/android-headers/13/frameworks/base/include/android_runtime/ActivityManager.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/android_runtime/ActivityManager.h rename to android-headers/13/frameworks/base/include/android_runtime/ActivityManager.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/android_runtime/AndroidRuntime.h b/android-headers/13/frameworks/base/include/android_runtime/AndroidRuntime.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/android_runtime/AndroidRuntime.h rename to android-headers/13/frameworks/base/include/android_runtime/AndroidRuntime.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/android_runtime/android_app_NativeActivity.h b/android-headers/13/frameworks/base/include/android_runtime/android_app_NativeActivity.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/android_runtime/android_app_NativeActivity.h rename to android-headers/13/frameworks/base/include/android_runtime/android_app_NativeActivity.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/android_runtime/android_content_res_Configuration.h b/android-headers/13/frameworks/base/include/android_runtime/android_content_res_Configuration.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/android_runtime/android_content_res_Configuration.h rename to android-headers/13/frameworks/base/include/android_runtime/android_content_res_Configuration.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/android_runtime/android_graphics_SurfaceTexture.h b/android-headers/13/frameworks/base/include/android_runtime/android_graphics_SurfaceTexture.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/android_runtime/android_graphics_SurfaceTexture.h rename to android-headers/13/frameworks/base/include/android_runtime/android_graphics_SurfaceTexture.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/android_runtime/android_util_AssetManager.h b/android-headers/13/frameworks/base/include/android_runtime/android_util_AssetManager.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/android_runtime/android_util_AssetManager.h rename to android-headers/13/frameworks/base/include/android_runtime/android_util_AssetManager.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/android_runtime/android_view_Surface.h b/android-headers/13/frameworks/base/include/android_runtime/android_view_Surface.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/android_runtime/android_view_Surface.h rename to android-headers/13/frameworks/base/include/android_runtime/android_view_Surface.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/binder/Binder.h b/android-headers/13/frameworks/base/include/binder/Binder.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/binder/Binder.h rename to android-headers/13/frameworks/base/include/binder/Binder.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/binder/BinderService.h b/android-headers/13/frameworks/base/include/binder/BinderService.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/binder/BinderService.h rename to android-headers/13/frameworks/base/include/binder/BinderService.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/binder/BpBinder.h b/android-headers/13/frameworks/base/include/binder/BpBinder.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/binder/BpBinder.h rename to android-headers/13/frameworks/base/include/binder/BpBinder.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/binder/CursorWindow.h b/android-headers/13/frameworks/base/include/binder/CursorWindow.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/binder/CursorWindow.h rename to android-headers/13/frameworks/base/include/binder/CursorWindow.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/binder/IBinder.h b/android-headers/13/frameworks/base/include/binder/IBinder.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/binder/IBinder.h rename to android-headers/13/frameworks/base/include/binder/IBinder.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/binder/IInterface.h b/android-headers/13/frameworks/base/include/binder/IInterface.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/binder/IInterface.h rename to android-headers/13/frameworks/base/include/binder/IInterface.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/binder/IMemory.h b/android-headers/13/frameworks/base/include/binder/IMemory.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/binder/IMemory.h rename to android-headers/13/frameworks/base/include/binder/IMemory.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/binder/IPCThreadState.h b/android-headers/13/frameworks/base/include/binder/IPCThreadState.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/binder/IPCThreadState.h rename to android-headers/13/frameworks/base/include/binder/IPCThreadState.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/binder/IPermissionController.h b/android-headers/13/frameworks/base/include/binder/IPermissionController.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/binder/IPermissionController.h rename to android-headers/13/frameworks/base/include/binder/IPermissionController.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/binder/IServiceManager.h b/android-headers/13/frameworks/base/include/binder/IServiceManager.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/binder/IServiceManager.h rename to android-headers/13/frameworks/base/include/binder/IServiceManager.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/binder/MemoryBase.h b/android-headers/13/frameworks/base/include/binder/MemoryBase.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/binder/MemoryBase.h rename to android-headers/13/frameworks/base/include/binder/MemoryBase.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/binder/MemoryDealer.h b/android-headers/13/frameworks/base/include/binder/MemoryDealer.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/binder/MemoryDealer.h rename to android-headers/13/frameworks/base/include/binder/MemoryDealer.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/binder/MemoryHeapBase.h b/android-headers/13/frameworks/base/include/binder/MemoryHeapBase.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/binder/MemoryHeapBase.h rename to android-headers/13/frameworks/base/include/binder/MemoryHeapBase.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/binder/MemoryHeapPmem.h b/android-headers/13/frameworks/base/include/binder/MemoryHeapPmem.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/binder/MemoryHeapPmem.h rename to android-headers/13/frameworks/base/include/binder/MemoryHeapPmem.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/binder/Parcel.h b/android-headers/13/frameworks/base/include/binder/Parcel.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/binder/Parcel.h rename to android-headers/13/frameworks/base/include/binder/Parcel.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/binder/Permission.h b/android-headers/13/frameworks/base/include/binder/Permission.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/binder/Permission.h rename to android-headers/13/frameworks/base/include/binder/Permission.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/binder/ProcessState.h b/android-headers/13/frameworks/base/include/binder/ProcessState.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/binder/ProcessState.h rename to android-headers/13/frameworks/base/include/binder/ProcessState.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/camera/Camera.h b/android-headers/13/frameworks/base/include/camera/Camera.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/camera/Camera.h rename to android-headers/13/frameworks/base/include/camera/Camera.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/camera/CameraHardwareInterface.h b/android-headers/13/frameworks/base/include/camera/CameraHardwareInterface.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/camera/CameraHardwareInterface.h rename to android-headers/13/frameworks/base/include/camera/CameraHardwareInterface.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/camera/CameraParameters.h b/android-headers/13/frameworks/base/include/camera/CameraParameters.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/camera/CameraParameters.h rename to android-headers/13/frameworks/base/include/camera/CameraParameters.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/camera/ICamera.h b/android-headers/13/frameworks/base/include/camera/ICamera.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/camera/ICamera.h rename to android-headers/13/frameworks/base/include/camera/ICamera.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/camera/ICameraClient.h b/android-headers/13/frameworks/base/include/camera/ICameraClient.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/camera/ICameraClient.h rename to android-headers/13/frameworks/base/include/camera/ICameraClient.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/camera/ICameraService.h b/android-headers/13/frameworks/base/include/camera/ICameraService.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/camera/ICameraService.h rename to android-headers/13/frameworks/base/include/camera/ICameraService.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/diskusage/dirsize.h b/android-headers/13/frameworks/base/include/diskusage/dirsize.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/diskusage/dirsize.h rename to android-headers/13/frameworks/base/include/diskusage/dirsize.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/drm/DrmConstraints.h b/android-headers/13/frameworks/base/include/drm/DrmConstraints.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/drm/DrmConstraints.h rename to android-headers/13/frameworks/base/include/drm/DrmConstraints.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/drm/DrmConvertedStatus.h b/android-headers/13/frameworks/base/include/drm/DrmConvertedStatus.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/drm/DrmConvertedStatus.h rename to android-headers/13/frameworks/base/include/drm/DrmConvertedStatus.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/drm/DrmInfo.h b/android-headers/13/frameworks/base/include/drm/DrmInfo.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/drm/DrmInfo.h rename to android-headers/13/frameworks/base/include/drm/DrmInfo.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/drm/DrmInfoEvent.h b/android-headers/13/frameworks/base/include/drm/DrmInfoEvent.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/drm/DrmInfoEvent.h rename to android-headers/13/frameworks/base/include/drm/DrmInfoEvent.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/drm/DrmInfoRequest.h b/android-headers/13/frameworks/base/include/drm/DrmInfoRequest.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/drm/DrmInfoRequest.h rename to android-headers/13/frameworks/base/include/drm/DrmInfoRequest.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/drm/DrmInfoStatus.h b/android-headers/13/frameworks/base/include/drm/DrmInfoStatus.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/drm/DrmInfoStatus.h rename to android-headers/13/frameworks/base/include/drm/DrmInfoStatus.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/drm/DrmManagerClient.h b/android-headers/13/frameworks/base/include/drm/DrmManagerClient.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/drm/DrmManagerClient.h rename to android-headers/13/frameworks/base/include/drm/DrmManagerClient.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/drm/DrmMetadata.h b/android-headers/13/frameworks/base/include/drm/DrmMetadata.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/drm/DrmMetadata.h rename to android-headers/13/frameworks/base/include/drm/DrmMetadata.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/drm/DrmRights.h b/android-headers/13/frameworks/base/include/drm/DrmRights.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/drm/DrmRights.h rename to android-headers/13/frameworks/base/include/drm/DrmRights.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/drm/DrmSupportInfo.h b/android-headers/13/frameworks/base/include/drm/DrmSupportInfo.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/drm/DrmSupportInfo.h rename to android-headers/13/frameworks/base/include/drm/DrmSupportInfo.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/drm/drm_framework_common.h b/android-headers/13/frameworks/base/include/drm/drm_framework_common.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/drm/drm_framework_common.h rename to android-headers/13/frameworks/base/include/drm/drm_framework_common.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/gui/ISensorEventConnection.h b/android-headers/13/frameworks/base/include/gui/ISensorEventConnection.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/gui/ISensorEventConnection.h rename to android-headers/13/frameworks/base/include/gui/ISensorEventConnection.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/gui/ISensorServer.h b/android-headers/13/frameworks/base/include/gui/ISensorServer.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/gui/ISensorServer.h rename to android-headers/13/frameworks/base/include/gui/ISensorServer.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/gui/ISurfaceTexture.h b/android-headers/13/frameworks/base/include/gui/ISurfaceTexture.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/gui/ISurfaceTexture.h rename to android-headers/13/frameworks/base/include/gui/ISurfaceTexture.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/gui/Sensor.h b/android-headers/13/frameworks/base/include/gui/Sensor.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/gui/Sensor.h rename to android-headers/13/frameworks/base/include/gui/Sensor.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/gui/SensorChannel.h b/android-headers/13/frameworks/base/include/gui/SensorChannel.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/gui/SensorChannel.h rename to android-headers/13/frameworks/base/include/gui/SensorChannel.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/gui/SensorEventQueue.h b/android-headers/13/frameworks/base/include/gui/SensorEventQueue.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/gui/SensorEventQueue.h rename to android-headers/13/frameworks/base/include/gui/SensorEventQueue.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/gui/SensorManager.h b/android-headers/13/frameworks/base/include/gui/SensorManager.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/gui/SensorManager.h rename to android-headers/13/frameworks/base/include/gui/SensorManager.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/gui/SurfaceTexture.h b/android-headers/13/frameworks/base/include/gui/SurfaceTexture.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/gui/SurfaceTexture.h rename to android-headers/13/frameworks/base/include/gui/SurfaceTexture.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/gui/SurfaceTextureClient.h b/android-headers/13/frameworks/base/include/gui/SurfaceTextureClient.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/gui/SurfaceTextureClient.h rename to android-headers/13/frameworks/base/include/gui/SurfaceTextureClient.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/media/AudioEffect.h b/android-headers/13/frameworks/base/include/media/AudioEffect.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/media/AudioEffect.h rename to android-headers/13/frameworks/base/include/media/AudioEffect.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/media/AudioRecord.h b/android-headers/13/frameworks/base/include/media/AudioRecord.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/media/AudioRecord.h rename to android-headers/13/frameworks/base/include/media/AudioRecord.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/media/AudioSystem.h b/android-headers/13/frameworks/base/include/media/AudioSystem.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/media/AudioSystem.h rename to android-headers/13/frameworks/base/include/media/AudioSystem.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/media/AudioTrack.h b/android-headers/13/frameworks/base/include/media/AudioTrack.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/media/AudioTrack.h rename to android-headers/13/frameworks/base/include/media/AudioTrack.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/media/EffectApi.h b/android-headers/13/frameworks/base/include/media/EffectApi.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/media/EffectApi.h rename to android-headers/13/frameworks/base/include/media/EffectApi.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/media/EffectBassBoostApi.h b/android-headers/13/frameworks/base/include/media/EffectBassBoostApi.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/media/EffectBassBoostApi.h rename to android-headers/13/frameworks/base/include/media/EffectBassBoostApi.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/media/EffectEnvironmentalReverbApi.h b/android-headers/13/frameworks/base/include/media/EffectEnvironmentalReverbApi.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/media/EffectEnvironmentalReverbApi.h rename to android-headers/13/frameworks/base/include/media/EffectEnvironmentalReverbApi.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/media/EffectEqualizerApi.h b/android-headers/13/frameworks/base/include/media/EffectEqualizerApi.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/media/EffectEqualizerApi.h rename to android-headers/13/frameworks/base/include/media/EffectEqualizerApi.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/media/EffectPresetReverbApi.h b/android-headers/13/frameworks/base/include/media/EffectPresetReverbApi.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/media/EffectPresetReverbApi.h rename to android-headers/13/frameworks/base/include/media/EffectPresetReverbApi.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/media/EffectVirtualizerApi.h b/android-headers/13/frameworks/base/include/media/EffectVirtualizerApi.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/media/EffectVirtualizerApi.h rename to android-headers/13/frameworks/base/include/media/EffectVirtualizerApi.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/media/EffectVisualizerApi.h b/android-headers/13/frameworks/base/include/media/EffectVisualizerApi.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/media/EffectVisualizerApi.h rename to android-headers/13/frameworks/base/include/media/EffectVisualizerApi.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/media/EffectsFactoryApi.h b/android-headers/13/frameworks/base/include/media/EffectsFactoryApi.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/media/EffectsFactoryApi.h rename to android-headers/13/frameworks/base/include/media/EffectsFactoryApi.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/media/IAudioFlinger.h b/android-headers/13/frameworks/base/include/media/IAudioFlinger.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/media/IAudioFlinger.h rename to android-headers/13/frameworks/base/include/media/IAudioFlinger.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/media/IAudioFlingerClient.h b/android-headers/13/frameworks/base/include/media/IAudioFlingerClient.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/media/IAudioFlingerClient.h rename to android-headers/13/frameworks/base/include/media/IAudioFlingerClient.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/media/IAudioPolicyService.h b/android-headers/13/frameworks/base/include/media/IAudioPolicyService.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/media/IAudioPolicyService.h rename to android-headers/13/frameworks/base/include/media/IAudioPolicyService.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/media/IAudioRecord.h b/android-headers/13/frameworks/base/include/media/IAudioRecord.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/media/IAudioRecord.h rename to android-headers/13/frameworks/base/include/media/IAudioRecord.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/media/IAudioTrack.h b/android-headers/13/frameworks/base/include/media/IAudioTrack.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/media/IAudioTrack.h rename to android-headers/13/frameworks/base/include/media/IAudioTrack.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/media/IEffect.h b/android-headers/13/frameworks/base/include/media/IEffect.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/media/IEffect.h rename to android-headers/13/frameworks/base/include/media/IEffect.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/media/IEffectClient.h b/android-headers/13/frameworks/base/include/media/IEffectClient.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/media/IEffectClient.h rename to android-headers/13/frameworks/base/include/media/IEffectClient.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/media/IMediaDeathNotifier.h b/android-headers/13/frameworks/base/include/media/IMediaDeathNotifier.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/media/IMediaDeathNotifier.h rename to android-headers/13/frameworks/base/include/media/IMediaDeathNotifier.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/media/IMediaMetadataRetriever.h b/android-headers/13/frameworks/base/include/media/IMediaMetadataRetriever.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/media/IMediaMetadataRetriever.h rename to android-headers/13/frameworks/base/include/media/IMediaMetadataRetriever.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/media/IMediaPlayer.h b/android-headers/13/frameworks/base/include/media/IMediaPlayer.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/media/IMediaPlayer.h rename to android-headers/13/frameworks/base/include/media/IMediaPlayer.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/media/IMediaPlayerClient.h b/android-headers/13/frameworks/base/include/media/IMediaPlayerClient.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/media/IMediaPlayerClient.h rename to android-headers/13/frameworks/base/include/media/IMediaPlayerClient.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/media/IMediaPlayerService.h b/android-headers/13/frameworks/base/include/media/IMediaPlayerService.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/media/IMediaPlayerService.h rename to android-headers/13/frameworks/base/include/media/IMediaPlayerService.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/media/IMediaRecorder.h b/android-headers/13/frameworks/base/include/media/IMediaRecorder.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/media/IMediaRecorder.h rename to android-headers/13/frameworks/base/include/media/IMediaRecorder.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/media/IMediaRecorderClient.h b/android-headers/13/frameworks/base/include/media/IMediaRecorderClient.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/media/IMediaRecorderClient.h rename to android-headers/13/frameworks/base/include/media/IMediaRecorderClient.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/media/IOMX.h b/android-headers/13/frameworks/base/include/media/IOMX.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/media/IOMX.h rename to android-headers/13/frameworks/base/include/media/IOMX.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/media/IStreamSource.h b/android-headers/13/frameworks/base/include/media/IStreamSource.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/media/IStreamSource.h rename to android-headers/13/frameworks/base/include/media/IStreamSource.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/media/JetPlayer.h b/android-headers/13/frameworks/base/include/media/JetPlayer.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/media/JetPlayer.h rename to android-headers/13/frameworks/base/include/media/JetPlayer.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/media/MediaMetadataRetrieverInterface.h b/android-headers/13/frameworks/base/include/media/MediaMetadataRetrieverInterface.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/media/MediaMetadataRetrieverInterface.h rename to android-headers/13/frameworks/base/include/media/MediaMetadataRetrieverInterface.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/media/MediaPlayerInterface.h b/android-headers/13/frameworks/base/include/media/MediaPlayerInterface.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/media/MediaPlayerInterface.h rename to android-headers/13/frameworks/base/include/media/MediaPlayerInterface.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/media/MediaProfiles.h b/android-headers/13/frameworks/base/include/media/MediaProfiles.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/media/MediaProfiles.h rename to android-headers/13/frameworks/base/include/media/MediaProfiles.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/media/MediaRecorderBase.h b/android-headers/13/frameworks/base/include/media/MediaRecorderBase.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/media/MediaRecorderBase.h rename to android-headers/13/frameworks/base/include/media/MediaRecorderBase.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/media/Metadata.h b/android-headers/13/frameworks/base/include/media/Metadata.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/media/Metadata.h rename to android-headers/13/frameworks/base/include/media/Metadata.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/media/ToneGenerator.h b/android-headers/13/frameworks/base/include/media/ToneGenerator.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/media/ToneGenerator.h rename to android-headers/13/frameworks/base/include/media/ToneGenerator.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/media/Visualizer.h b/android-headers/13/frameworks/base/include/media/Visualizer.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/media/Visualizer.h rename to android-headers/13/frameworks/base/include/media/Visualizer.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/media/mediametadataretriever.h b/android-headers/13/frameworks/base/include/media/mediametadataretriever.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/media/mediametadataretriever.h rename to android-headers/13/frameworks/base/include/media/mediametadataretriever.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/media/mediaplayer.h b/android-headers/13/frameworks/base/include/media/mediaplayer.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/media/mediaplayer.h rename to android-headers/13/frameworks/base/include/media/mediaplayer.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/media/mediarecorder.h b/android-headers/13/frameworks/base/include/media/mediarecorder.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/media/mediarecorder.h rename to android-headers/13/frameworks/base/include/media/mediarecorder.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/media/mediascanner.h b/android-headers/13/frameworks/base/include/media/mediascanner.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/media/mediascanner.h rename to android-headers/13/frameworks/base/include/media/mediascanner.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/media/stagefright/ACodec.h b/android-headers/13/frameworks/base/include/media/stagefright/ACodec.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/media/stagefright/ACodec.h rename to android-headers/13/frameworks/base/include/media/stagefright/ACodec.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/media/stagefright/AMRWriter.h b/android-headers/13/frameworks/base/include/media/stagefright/AMRWriter.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/media/stagefright/AMRWriter.h rename to android-headers/13/frameworks/base/include/media/stagefright/AMRWriter.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/media/stagefright/AudioPlayer.h b/android-headers/13/frameworks/base/include/media/stagefright/AudioPlayer.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/media/stagefright/AudioPlayer.h rename to android-headers/13/frameworks/base/include/media/stagefright/AudioPlayer.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/media/stagefright/AudioSource.h b/android-headers/13/frameworks/base/include/media/stagefright/AudioSource.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/media/stagefright/AudioSource.h rename to android-headers/13/frameworks/base/include/media/stagefright/AudioSource.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/media/stagefright/CameraSource.h b/android-headers/13/frameworks/base/include/media/stagefright/CameraSource.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/media/stagefright/CameraSource.h rename to android-headers/13/frameworks/base/include/media/stagefright/CameraSource.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/media/stagefright/CameraSourceTimeLapse.h b/android-headers/13/frameworks/base/include/media/stagefright/CameraSourceTimeLapse.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/media/stagefright/CameraSourceTimeLapse.h rename to android-headers/13/frameworks/base/include/media/stagefright/CameraSourceTimeLapse.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/media/stagefright/ColorConverter.h b/android-headers/13/frameworks/base/include/media/stagefright/ColorConverter.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/media/stagefright/ColorConverter.h rename to android-headers/13/frameworks/base/include/media/stagefright/ColorConverter.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/media/stagefright/DataSource.h b/android-headers/13/frameworks/base/include/media/stagefright/DataSource.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/media/stagefright/DataSource.h rename to android-headers/13/frameworks/base/include/media/stagefright/DataSource.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/media/stagefright/FileSource.h b/android-headers/13/frameworks/base/include/media/stagefright/FileSource.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/media/stagefright/FileSource.h rename to android-headers/13/frameworks/base/include/media/stagefright/FileSource.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/media/stagefright/HardwareAPI.h b/android-headers/13/frameworks/base/include/media/stagefright/HardwareAPI.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/media/stagefright/HardwareAPI.h rename to android-headers/13/frameworks/base/include/media/stagefright/HardwareAPI.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/media/stagefright/JPEGSource.h b/android-headers/13/frameworks/base/include/media/stagefright/JPEGSource.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/media/stagefright/JPEGSource.h rename to android-headers/13/frameworks/base/include/media/stagefright/JPEGSource.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/media/stagefright/MPEG2TSWriter.h b/android-headers/13/frameworks/base/include/media/stagefright/MPEG2TSWriter.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/media/stagefright/MPEG2TSWriter.h rename to android-headers/13/frameworks/base/include/media/stagefright/MPEG2TSWriter.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/media/stagefright/MPEG4Writer.h b/android-headers/13/frameworks/base/include/media/stagefright/MPEG4Writer.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/media/stagefright/MPEG4Writer.h rename to android-headers/13/frameworks/base/include/media/stagefright/MPEG4Writer.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/media/stagefright/MediaBuffer.h b/android-headers/13/frameworks/base/include/media/stagefright/MediaBuffer.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/media/stagefright/MediaBuffer.h rename to android-headers/13/frameworks/base/include/media/stagefright/MediaBuffer.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/media/stagefright/MediaBufferGroup.h b/android-headers/13/frameworks/base/include/media/stagefright/MediaBufferGroup.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/media/stagefright/MediaBufferGroup.h rename to android-headers/13/frameworks/base/include/media/stagefright/MediaBufferGroup.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/media/stagefright/MediaDebug.h b/android-headers/13/frameworks/base/include/media/stagefright/MediaDebug.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/media/stagefright/MediaDebug.h rename to android-headers/13/frameworks/base/include/media/stagefright/MediaDebug.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/media/stagefright/MediaDefs.h b/android-headers/13/frameworks/base/include/media/stagefright/MediaDefs.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/media/stagefright/MediaDefs.h rename to android-headers/13/frameworks/base/include/media/stagefright/MediaDefs.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/media/stagefright/MediaErrors.h b/android-headers/13/frameworks/base/include/media/stagefright/MediaErrors.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/media/stagefright/MediaErrors.h rename to android-headers/13/frameworks/base/include/media/stagefright/MediaErrors.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/media/stagefright/MediaExtractor.h b/android-headers/13/frameworks/base/include/media/stagefright/MediaExtractor.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/media/stagefright/MediaExtractor.h rename to android-headers/13/frameworks/base/include/media/stagefright/MediaExtractor.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/media/stagefright/MediaSource.h b/android-headers/13/frameworks/base/include/media/stagefright/MediaSource.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/media/stagefright/MediaSource.h rename to android-headers/13/frameworks/base/include/media/stagefright/MediaSource.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/media/stagefright/MediaSourceSplitter.h b/android-headers/13/frameworks/base/include/media/stagefright/MediaSourceSplitter.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/media/stagefright/MediaSourceSplitter.h rename to android-headers/13/frameworks/base/include/media/stagefright/MediaSourceSplitter.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/media/stagefright/MediaWriter.h b/android-headers/13/frameworks/base/include/media/stagefright/MediaWriter.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/media/stagefright/MediaWriter.h rename to android-headers/13/frameworks/base/include/media/stagefright/MediaWriter.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/media/stagefright/MetaData.h b/android-headers/13/frameworks/base/include/media/stagefright/MetaData.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/media/stagefright/MetaData.h rename to android-headers/13/frameworks/base/include/media/stagefright/MetaData.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/media/stagefright/NativeWindowWrapper.h b/android-headers/13/frameworks/base/include/media/stagefright/NativeWindowWrapper.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/media/stagefright/NativeWindowWrapper.h rename to android-headers/13/frameworks/base/include/media/stagefright/NativeWindowWrapper.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/media/stagefright/OMXClient.h b/android-headers/13/frameworks/base/include/media/stagefright/OMXClient.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/media/stagefright/OMXClient.h rename to android-headers/13/frameworks/base/include/media/stagefright/OMXClient.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/media/stagefright/OMXCodec.h b/android-headers/13/frameworks/base/include/media/stagefright/OMXCodec.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/media/stagefright/OMXCodec.h rename to android-headers/13/frameworks/base/include/media/stagefright/OMXCodec.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/media/stagefright/OMXPluginBase.h b/android-headers/13/frameworks/base/include/media/stagefright/OMXPluginBase.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/media/stagefright/OMXPluginBase.h rename to android-headers/13/frameworks/base/include/media/stagefright/OMXPluginBase.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/media/stagefright/ShoutcastSource.h b/android-headers/13/frameworks/base/include/media/stagefright/ShoutcastSource.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/media/stagefright/ShoutcastSource.h rename to android-headers/13/frameworks/base/include/media/stagefright/ShoutcastSource.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/media/stagefright/StagefrightMediaScanner.h b/android-headers/13/frameworks/base/include/media/stagefright/StagefrightMediaScanner.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/media/stagefright/StagefrightMediaScanner.h rename to android-headers/13/frameworks/base/include/media/stagefright/StagefrightMediaScanner.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/media/stagefright/TimeSource.h b/android-headers/13/frameworks/base/include/media/stagefright/TimeSource.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/media/stagefright/TimeSource.h rename to android-headers/13/frameworks/base/include/media/stagefright/TimeSource.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/media/stagefright/Utils.h b/android-headers/13/frameworks/base/include/media/stagefright/Utils.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/media/stagefright/Utils.h rename to android-headers/13/frameworks/base/include/media/stagefright/Utils.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/media/stagefright/VideoSourceDownSampler.h b/android-headers/13/frameworks/base/include/media/stagefright/VideoSourceDownSampler.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/media/stagefright/VideoSourceDownSampler.h rename to android-headers/13/frameworks/base/include/media/stagefright/VideoSourceDownSampler.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/media/stagefright/YUVCanvas.h b/android-headers/13/frameworks/base/include/media/stagefright/YUVCanvas.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/media/stagefright/YUVCanvas.h rename to android-headers/13/frameworks/base/include/media/stagefright/YUVCanvas.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/media/stagefright/YUVImage.h b/android-headers/13/frameworks/base/include/media/stagefright/YUVImage.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/media/stagefright/YUVImage.h rename to android-headers/13/frameworks/base/include/media/stagefright/YUVImage.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/media/stagefright/foundation/AAtomizer.h b/android-headers/13/frameworks/base/include/media/stagefright/foundation/AAtomizer.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/media/stagefright/foundation/AAtomizer.h rename to android-headers/13/frameworks/base/include/media/stagefright/foundation/AAtomizer.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/media/stagefright/foundation/ABase.h b/android-headers/13/frameworks/base/include/media/stagefright/foundation/ABase.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/media/stagefright/foundation/ABase.h rename to android-headers/13/frameworks/base/include/media/stagefright/foundation/ABase.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/media/stagefright/foundation/ABitReader.h b/android-headers/13/frameworks/base/include/media/stagefright/foundation/ABitReader.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/media/stagefright/foundation/ABitReader.h rename to android-headers/13/frameworks/base/include/media/stagefright/foundation/ABitReader.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/media/stagefright/foundation/ABuffer.h b/android-headers/13/frameworks/base/include/media/stagefright/foundation/ABuffer.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/media/stagefright/foundation/ABuffer.h rename to android-headers/13/frameworks/base/include/media/stagefright/foundation/ABuffer.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/media/stagefright/foundation/ADebug.h b/android-headers/13/frameworks/base/include/media/stagefright/foundation/ADebug.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/media/stagefright/foundation/ADebug.h rename to android-headers/13/frameworks/base/include/media/stagefright/foundation/ADebug.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/media/stagefright/foundation/AHandler.h b/android-headers/13/frameworks/base/include/media/stagefright/foundation/AHandler.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/media/stagefright/foundation/AHandler.h rename to android-headers/13/frameworks/base/include/media/stagefright/foundation/AHandler.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/media/stagefright/foundation/AHandlerReflector.h b/android-headers/13/frameworks/base/include/media/stagefright/foundation/AHandlerReflector.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/media/stagefright/foundation/AHandlerReflector.h rename to android-headers/13/frameworks/base/include/media/stagefright/foundation/AHandlerReflector.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/media/stagefright/foundation/AHierarchicalStateMachine.h b/android-headers/13/frameworks/base/include/media/stagefright/foundation/AHierarchicalStateMachine.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/media/stagefright/foundation/AHierarchicalStateMachine.h rename to android-headers/13/frameworks/base/include/media/stagefright/foundation/AHierarchicalStateMachine.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/media/stagefright/foundation/ALooper.h b/android-headers/13/frameworks/base/include/media/stagefright/foundation/ALooper.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/media/stagefright/foundation/ALooper.h rename to android-headers/13/frameworks/base/include/media/stagefright/foundation/ALooper.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/media/stagefright/foundation/ALooperRoster.h b/android-headers/13/frameworks/base/include/media/stagefright/foundation/ALooperRoster.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/media/stagefright/foundation/ALooperRoster.h rename to android-headers/13/frameworks/base/include/media/stagefright/foundation/ALooperRoster.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/media/stagefright/foundation/AMessage.h b/android-headers/13/frameworks/base/include/media/stagefright/foundation/AMessage.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/media/stagefright/foundation/AMessage.h rename to android-headers/13/frameworks/base/include/media/stagefright/foundation/AMessage.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/media/stagefright/foundation/AString.h b/android-headers/13/frameworks/base/include/media/stagefright/foundation/AString.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/media/stagefright/foundation/AString.h rename to android-headers/13/frameworks/base/include/media/stagefright/foundation/AString.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/media/stagefright/foundation/base64.h b/android-headers/13/frameworks/base/include/media/stagefright/foundation/base64.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/media/stagefright/foundation/base64.h rename to android-headers/13/frameworks/base/include/media/stagefright/foundation/base64.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/media/stagefright/foundation/hexdump.h b/android-headers/13/frameworks/base/include/media/stagefright/foundation/hexdump.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/media/stagefright/foundation/hexdump.h rename to android-headers/13/frameworks/base/include/media/stagefright/foundation/hexdump.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/media/stagefright/openmax/OMX_Audio.h b/android-headers/13/frameworks/base/include/media/stagefright/openmax/OMX_Audio.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/media/stagefright/openmax/OMX_Audio.h rename to android-headers/13/frameworks/base/include/media/stagefright/openmax/OMX_Audio.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/media/stagefright/openmax/OMX_Component.h b/android-headers/13/frameworks/base/include/media/stagefright/openmax/OMX_Component.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/media/stagefright/openmax/OMX_Component.h rename to android-headers/13/frameworks/base/include/media/stagefright/openmax/OMX_Component.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/media/stagefright/openmax/OMX_ContentPipe.h b/android-headers/13/frameworks/base/include/media/stagefright/openmax/OMX_ContentPipe.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/media/stagefright/openmax/OMX_ContentPipe.h rename to android-headers/13/frameworks/base/include/media/stagefright/openmax/OMX_ContentPipe.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/media/stagefright/openmax/OMX_Core.h b/android-headers/13/frameworks/base/include/media/stagefright/openmax/OMX_Core.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/media/stagefright/openmax/OMX_Core.h rename to android-headers/13/frameworks/base/include/media/stagefright/openmax/OMX_Core.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/media/stagefright/openmax/OMX_IVCommon.h b/android-headers/13/frameworks/base/include/media/stagefright/openmax/OMX_IVCommon.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/media/stagefright/openmax/OMX_IVCommon.h rename to android-headers/13/frameworks/base/include/media/stagefright/openmax/OMX_IVCommon.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/media/stagefright/openmax/OMX_Image.h b/android-headers/13/frameworks/base/include/media/stagefright/openmax/OMX_Image.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/media/stagefright/openmax/OMX_Image.h rename to android-headers/13/frameworks/base/include/media/stagefright/openmax/OMX_Image.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/media/stagefright/openmax/OMX_Index.h b/android-headers/13/frameworks/base/include/media/stagefright/openmax/OMX_Index.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/media/stagefright/openmax/OMX_Index.h rename to android-headers/13/frameworks/base/include/media/stagefright/openmax/OMX_Index.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/media/stagefright/openmax/OMX_Other.h b/android-headers/13/frameworks/base/include/media/stagefright/openmax/OMX_Other.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/media/stagefright/openmax/OMX_Other.h rename to android-headers/13/frameworks/base/include/media/stagefright/openmax/OMX_Other.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/media/stagefright/openmax/OMX_Types.h b/android-headers/13/frameworks/base/include/media/stagefright/openmax/OMX_Types.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/media/stagefright/openmax/OMX_Types.h rename to android-headers/13/frameworks/base/include/media/stagefright/openmax/OMX_Types.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/media/stagefright/openmax/OMX_Video.h b/android-headers/13/frameworks/base/include/media/stagefright/openmax/OMX_Video.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/media/stagefright/openmax/OMX_Video.h rename to android-headers/13/frameworks/base/include/media/stagefright/openmax/OMX_Video.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/media/thread_init.h b/android-headers/13/frameworks/base/include/media/thread_init.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/media/thread_init.h rename to android-headers/13/frameworks/base/include/media/thread_init.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/pim/EventRecurrence.h b/android-headers/13/frameworks/base/include/pim/EventRecurrence.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/pim/EventRecurrence.h rename to android-headers/13/frameworks/base/include/pim/EventRecurrence.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/private/README b/android-headers/13/frameworks/base/include/private/README similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/private/README rename to android-headers/13/frameworks/base/include/private/README diff --git a/android-headers/android-headers-hc/frameworks/base/include/private/binder/Static.h b/android-headers/13/frameworks/base/include/private/binder/Static.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/private/binder/Static.h rename to android-headers/13/frameworks/base/include/private/binder/Static.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/private/binder/binder_module.h b/android-headers/13/frameworks/base/include/private/binder/binder_module.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/private/binder/binder_module.h rename to android-headers/13/frameworks/base/include/private/binder/binder_module.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/private/hwui/DrawGlInfo.h b/android-headers/13/frameworks/base/include/private/hwui/DrawGlInfo.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/private/hwui/DrawGlInfo.h rename to android-headers/13/frameworks/base/include/private/hwui/DrawGlInfo.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/private/media/AudioEffectShared.h b/android-headers/13/frameworks/base/include/private/media/AudioEffectShared.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/private/media/AudioEffectShared.h rename to android-headers/13/frameworks/base/include/private/media/AudioEffectShared.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/private/media/AudioTrackShared.h b/android-headers/13/frameworks/base/include/private/media/AudioTrackShared.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/private/media/AudioTrackShared.h rename to android-headers/13/frameworks/base/include/private/media/AudioTrackShared.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/private/media/VideoFrame.h b/android-headers/13/frameworks/base/include/private/media/VideoFrame.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/private/media/VideoFrame.h rename to android-headers/13/frameworks/base/include/private/media/VideoFrame.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/private/opengles/gl_context.h b/android-headers/13/frameworks/base/include/private/opengles/gl_context.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/private/opengles/gl_context.h rename to android-headers/13/frameworks/base/include/private/opengles/gl_context.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/private/surfaceflinger/LayerState.h b/android-headers/13/frameworks/base/include/private/surfaceflinger/LayerState.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/private/surfaceflinger/LayerState.h rename to android-headers/13/frameworks/base/include/private/surfaceflinger/LayerState.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/private/surfaceflinger/SharedBufferStack.h b/android-headers/13/frameworks/base/include/private/surfaceflinger/SharedBufferStack.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/private/surfaceflinger/SharedBufferStack.h rename to android-headers/13/frameworks/base/include/private/surfaceflinger/SharedBufferStack.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/private/ui/RegionHelper.h b/android-headers/13/frameworks/base/include/private/ui/RegionHelper.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/private/ui/RegionHelper.h rename to android-headers/13/frameworks/base/include/private/ui/RegionHelper.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/private/ui/android_natives_priv.h b/android-headers/13/frameworks/base/include/private/ui/android_natives_priv.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/private/ui/android_natives_priv.h rename to android-headers/13/frameworks/base/include/private/ui/android_natives_priv.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/private/utils/Static.h b/android-headers/13/frameworks/base/include/private/utils/Static.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/private/utils/Static.h rename to android-headers/13/frameworks/base/include/private/utils/Static.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/storage/IMountService.h b/android-headers/13/frameworks/base/include/storage/IMountService.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/storage/IMountService.h rename to android-headers/13/frameworks/base/include/storage/IMountService.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/storage/IMountServiceListener.h b/android-headers/13/frameworks/base/include/storage/IMountServiceListener.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/storage/IMountServiceListener.h rename to android-headers/13/frameworks/base/include/storage/IMountServiceListener.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/storage/IMountShutdownObserver.h b/android-headers/13/frameworks/base/include/storage/IMountShutdownObserver.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/storage/IMountShutdownObserver.h rename to android-headers/13/frameworks/base/include/storage/IMountShutdownObserver.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/storage/IObbActionListener.h b/android-headers/13/frameworks/base/include/storage/IObbActionListener.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/storage/IObbActionListener.h rename to android-headers/13/frameworks/base/include/storage/IObbActionListener.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/surfaceflinger/IGraphicBufferAlloc.h b/android-headers/13/frameworks/base/include/surfaceflinger/IGraphicBufferAlloc.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/surfaceflinger/IGraphicBufferAlloc.h rename to android-headers/13/frameworks/base/include/surfaceflinger/IGraphicBufferAlloc.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/surfaceflinger/ISurface.h b/android-headers/13/frameworks/base/include/surfaceflinger/ISurface.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/surfaceflinger/ISurface.h rename to android-headers/13/frameworks/base/include/surfaceflinger/ISurface.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/surfaceflinger/ISurfaceComposer.h b/android-headers/13/frameworks/base/include/surfaceflinger/ISurfaceComposer.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/surfaceflinger/ISurfaceComposer.h rename to android-headers/13/frameworks/base/include/surfaceflinger/ISurfaceComposer.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/surfaceflinger/ISurfaceComposerClient.h b/android-headers/13/frameworks/base/include/surfaceflinger/ISurfaceComposerClient.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/surfaceflinger/ISurfaceComposerClient.h rename to android-headers/13/frameworks/base/include/surfaceflinger/ISurfaceComposerClient.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/surfaceflinger/Surface.h b/android-headers/13/frameworks/base/include/surfaceflinger/Surface.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/surfaceflinger/Surface.h rename to android-headers/13/frameworks/base/include/surfaceflinger/Surface.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/surfaceflinger/SurfaceComposerClient.h b/android-headers/13/frameworks/base/include/surfaceflinger/SurfaceComposerClient.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/surfaceflinger/SurfaceComposerClient.h rename to android-headers/13/frameworks/base/include/surfaceflinger/SurfaceComposerClient.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/tts/TtsEngine.h b/android-headers/13/frameworks/base/include/tts/TtsEngine.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/tts/TtsEngine.h rename to android-headers/13/frameworks/base/include/tts/TtsEngine.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/ui/DisplayInfo.h b/android-headers/13/frameworks/base/include/ui/DisplayInfo.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/ui/DisplayInfo.h rename to android-headers/13/frameworks/base/include/ui/DisplayInfo.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/ui/EGLNativeSurface.h b/android-headers/13/frameworks/base/include/ui/EGLNativeSurface.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/ui/EGLNativeSurface.h rename to android-headers/13/frameworks/base/include/ui/EGLNativeSurface.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/ui/EGLUtils.h b/android-headers/13/frameworks/base/include/ui/EGLUtils.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/ui/EGLUtils.h rename to android-headers/13/frameworks/base/include/ui/EGLUtils.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/ui/FramebufferNativeWindow.h b/android-headers/13/frameworks/base/include/ui/FramebufferNativeWindow.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/ui/FramebufferNativeWindow.h rename to android-headers/13/frameworks/base/include/ui/FramebufferNativeWindow.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/ui/GraphicBuffer.h b/android-headers/13/frameworks/base/include/ui/GraphicBuffer.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/ui/GraphicBuffer.h rename to android-headers/13/frameworks/base/include/ui/GraphicBuffer.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/ui/GraphicBufferAllocator.h b/android-headers/13/frameworks/base/include/ui/GraphicBufferAllocator.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/ui/GraphicBufferAllocator.h rename to android-headers/13/frameworks/base/include/ui/GraphicBufferAllocator.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/ui/GraphicBufferMapper.h b/android-headers/13/frameworks/base/include/ui/GraphicBufferMapper.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/ui/GraphicBufferMapper.h rename to android-headers/13/frameworks/base/include/ui/GraphicBufferMapper.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/ui/GraphicLog.h b/android-headers/13/frameworks/base/include/ui/GraphicLog.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/ui/GraphicLog.h rename to android-headers/13/frameworks/base/include/ui/GraphicLog.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/ui/Input.h b/android-headers/13/frameworks/base/include/ui/Input.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/ui/Input.h rename to android-headers/13/frameworks/base/include/ui/Input.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/ui/InputTransport.h b/android-headers/13/frameworks/base/include/ui/InputTransport.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/ui/InputTransport.h rename to android-headers/13/frameworks/base/include/ui/InputTransport.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/ui/KeyCharacterMap.h b/android-headers/13/frameworks/base/include/ui/KeyCharacterMap.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/ui/KeyCharacterMap.h rename to android-headers/13/frameworks/base/include/ui/KeyCharacterMap.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/ui/KeyLayoutMap.h b/android-headers/13/frameworks/base/include/ui/KeyLayoutMap.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/ui/KeyLayoutMap.h rename to android-headers/13/frameworks/base/include/ui/KeyLayoutMap.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/ui/Keyboard.h b/android-headers/13/frameworks/base/include/ui/Keyboard.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/ui/Keyboard.h rename to android-headers/13/frameworks/base/include/ui/Keyboard.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/ui/KeycodeLabels.h b/android-headers/13/frameworks/base/include/ui/KeycodeLabels.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/ui/KeycodeLabels.h rename to android-headers/13/frameworks/base/include/ui/KeycodeLabels.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/ui/PixelFormat.h b/android-headers/13/frameworks/base/include/ui/PixelFormat.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/ui/PixelFormat.h rename to android-headers/13/frameworks/base/include/ui/PixelFormat.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/ui/Point.h b/android-headers/13/frameworks/base/include/ui/Point.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/ui/Point.h rename to android-headers/13/frameworks/base/include/ui/Point.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/ui/PowerManager.h b/android-headers/13/frameworks/base/include/ui/PowerManager.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/ui/PowerManager.h rename to android-headers/13/frameworks/base/include/ui/PowerManager.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/ui/Rect.h b/android-headers/13/frameworks/base/include/ui/Rect.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/ui/Rect.h rename to android-headers/13/frameworks/base/include/ui/Rect.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/ui/Region.h b/android-headers/13/frameworks/base/include/ui/Region.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/ui/Region.h rename to android-headers/13/frameworks/base/include/ui/Region.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/ui/VirtualKeyMap.h b/android-headers/13/frameworks/base/include/ui/VirtualKeyMap.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/ui/VirtualKeyMap.h rename to android-headers/13/frameworks/base/include/ui/VirtualKeyMap.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/ui/android_native_buffer.h b/android-headers/13/frameworks/base/include/ui/android_native_buffer.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/ui/android_native_buffer.h rename to android-headers/13/frameworks/base/include/ui/android_native_buffer.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/ui/egl/android_natives.h b/android-headers/13/frameworks/base/include/ui/egl/android_natives.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/ui/egl/android_natives.h rename to android-headers/13/frameworks/base/include/ui/egl/android_natives.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/utils/Asset.h b/android-headers/13/frameworks/base/include/utils/Asset.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/utils/Asset.h rename to android-headers/13/frameworks/base/include/utils/Asset.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/utils/AssetDir.h b/android-headers/13/frameworks/base/include/utils/AssetDir.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/utils/AssetDir.h rename to android-headers/13/frameworks/base/include/utils/AssetDir.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/utils/AssetManager.h b/android-headers/13/frameworks/base/include/utils/AssetManager.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/utils/AssetManager.h rename to android-headers/13/frameworks/base/include/utils/AssetManager.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/utils/Atomic.h b/android-headers/13/frameworks/base/include/utils/Atomic.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/utils/Atomic.h rename to android-headers/13/frameworks/base/include/utils/Atomic.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/utils/BackupHelpers.h b/android-headers/13/frameworks/base/include/utils/BackupHelpers.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/utils/BackupHelpers.h rename to android-headers/13/frameworks/base/include/utils/BackupHelpers.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/utils/BitSet.h b/android-headers/13/frameworks/base/include/utils/BitSet.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/utils/BitSet.h rename to android-headers/13/frameworks/base/include/utils/BitSet.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/utils/BufferedTextOutput.h b/android-headers/13/frameworks/base/include/utils/BufferedTextOutput.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/utils/BufferedTextOutput.h rename to android-headers/13/frameworks/base/include/utils/BufferedTextOutput.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/utils/ByteOrder.h b/android-headers/13/frameworks/base/include/utils/ByteOrder.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/utils/ByteOrder.h rename to android-headers/13/frameworks/base/include/utils/ByteOrder.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/utils/CallStack.h b/android-headers/13/frameworks/base/include/utils/CallStack.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/utils/CallStack.h rename to android-headers/13/frameworks/base/include/utils/CallStack.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/utils/Compat.h b/android-headers/13/frameworks/base/include/utils/Compat.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/utils/Compat.h rename to android-headers/13/frameworks/base/include/utils/Compat.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/utils/Debug.h b/android-headers/13/frameworks/base/include/utils/Debug.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/utils/Debug.h rename to android-headers/13/frameworks/base/include/utils/Debug.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/utils/Endian.h b/android-headers/13/frameworks/base/include/utils/Endian.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/utils/Endian.h rename to android-headers/13/frameworks/base/include/utils/Endian.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/utils/Errors.h b/android-headers/13/frameworks/base/include/utils/Errors.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/utils/Errors.h rename to android-headers/13/frameworks/base/include/utils/Errors.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/utils/FileMap.h b/android-headers/13/frameworks/base/include/utils/FileMap.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/utils/FileMap.h rename to android-headers/13/frameworks/base/include/utils/FileMap.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/utils/Flattenable.h b/android-headers/13/frameworks/base/include/utils/Flattenable.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/utils/Flattenable.h rename to android-headers/13/frameworks/base/include/utils/Flattenable.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/utils/Functor.h b/android-headers/13/frameworks/base/include/utils/Functor.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/utils/Functor.h rename to android-headers/13/frameworks/base/include/utils/Functor.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/utils/KeyedVector.h b/android-headers/13/frameworks/base/include/utils/KeyedVector.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/utils/KeyedVector.h rename to android-headers/13/frameworks/base/include/utils/KeyedVector.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/utils/List.h b/android-headers/13/frameworks/base/include/utils/List.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/utils/List.h rename to android-headers/13/frameworks/base/include/utils/List.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/utils/Log.h b/android-headers/13/frameworks/base/include/utils/Log.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/utils/Log.h rename to android-headers/13/frameworks/base/include/utils/Log.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/utils/Looper.h b/android-headers/13/frameworks/base/include/utils/Looper.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/utils/Looper.h rename to android-headers/13/frameworks/base/include/utils/Looper.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/utils/ObbFile.h b/android-headers/13/frameworks/base/include/utils/ObbFile.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/utils/ObbFile.h rename to android-headers/13/frameworks/base/include/utils/ObbFile.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/utils/Pool.h b/android-headers/13/frameworks/base/include/utils/Pool.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/utils/Pool.h rename to android-headers/13/frameworks/base/include/utils/Pool.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/utils/PropertyMap.h b/android-headers/13/frameworks/base/include/utils/PropertyMap.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/utils/PropertyMap.h rename to android-headers/13/frameworks/base/include/utils/PropertyMap.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/utils/RefBase.h b/android-headers/13/frameworks/base/include/utils/RefBase.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/utils/RefBase.h rename to android-headers/13/frameworks/base/include/utils/RefBase.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/utils/ResourceTypes.h b/android-headers/13/frameworks/base/include/utils/ResourceTypes.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/utils/ResourceTypes.h rename to android-headers/13/frameworks/base/include/utils/ResourceTypes.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/utils/SharedBuffer.h b/android-headers/13/frameworks/base/include/utils/SharedBuffer.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/utils/SharedBuffer.h rename to android-headers/13/frameworks/base/include/utils/SharedBuffer.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/utils/Singleton.h b/android-headers/13/frameworks/base/include/utils/Singleton.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/utils/Singleton.h rename to android-headers/13/frameworks/base/include/utils/Singleton.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/utils/SortedVector.h b/android-headers/13/frameworks/base/include/utils/SortedVector.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/utils/SortedVector.h rename to android-headers/13/frameworks/base/include/utils/SortedVector.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/utils/StopWatch.h b/android-headers/13/frameworks/base/include/utils/StopWatch.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/utils/StopWatch.h rename to android-headers/13/frameworks/base/include/utils/StopWatch.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/utils/StreamingZipInflater.h b/android-headers/13/frameworks/base/include/utils/StreamingZipInflater.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/utils/StreamingZipInflater.h rename to android-headers/13/frameworks/base/include/utils/StreamingZipInflater.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/utils/String16.h b/android-headers/13/frameworks/base/include/utils/String16.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/utils/String16.h rename to android-headers/13/frameworks/base/include/utils/String16.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/utils/String8.h b/android-headers/13/frameworks/base/include/utils/String8.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/utils/String8.h rename to android-headers/13/frameworks/base/include/utils/String8.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/utils/StringArray.h b/android-headers/13/frameworks/base/include/utils/StringArray.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/utils/StringArray.h rename to android-headers/13/frameworks/base/include/utils/StringArray.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/utils/StrongPointer.h b/android-headers/13/frameworks/base/include/utils/StrongPointer.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/utils/StrongPointer.h rename to android-headers/13/frameworks/base/include/utils/StrongPointer.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/utils/SystemClock.h b/android-headers/13/frameworks/base/include/utils/SystemClock.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/utils/SystemClock.h rename to android-headers/13/frameworks/base/include/utils/SystemClock.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/utils/TextOutput.h b/android-headers/13/frameworks/base/include/utils/TextOutput.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/utils/TextOutput.h rename to android-headers/13/frameworks/base/include/utils/TextOutput.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/utils/Timers.h b/android-headers/13/frameworks/base/include/utils/Timers.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/utils/Timers.h rename to android-headers/13/frameworks/base/include/utils/Timers.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/utils/Tokenizer.h b/android-headers/13/frameworks/base/include/utils/Tokenizer.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/utils/Tokenizer.h rename to android-headers/13/frameworks/base/include/utils/Tokenizer.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/utils/TypeHelpers.h b/android-headers/13/frameworks/base/include/utils/TypeHelpers.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/utils/TypeHelpers.h rename to android-headers/13/frameworks/base/include/utils/TypeHelpers.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/utils/Unicode.h b/android-headers/13/frameworks/base/include/utils/Unicode.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/utils/Unicode.h rename to android-headers/13/frameworks/base/include/utils/Unicode.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/utils/Vector.h b/android-headers/13/frameworks/base/include/utils/Vector.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/utils/Vector.h rename to android-headers/13/frameworks/base/include/utils/Vector.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/utils/VectorImpl.h b/android-headers/13/frameworks/base/include/utils/VectorImpl.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/utils/VectorImpl.h rename to android-headers/13/frameworks/base/include/utils/VectorImpl.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/utils/ZipFileCRO.h b/android-headers/13/frameworks/base/include/utils/ZipFileCRO.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/utils/ZipFileCRO.h rename to android-headers/13/frameworks/base/include/utils/ZipFileCRO.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/utils/ZipFileRO.h b/android-headers/13/frameworks/base/include/utils/ZipFileRO.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/utils/ZipFileRO.h rename to android-headers/13/frameworks/base/include/utils/ZipFileRO.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/utils/ZipUtils.h b/android-headers/13/frameworks/base/include/utils/ZipUtils.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/utils/ZipUtils.h rename to android-headers/13/frameworks/base/include/utils/ZipUtils.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/utils/ashmem.h b/android-headers/13/frameworks/base/include/utils/ashmem.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/utils/ashmem.h rename to android-headers/13/frameworks/base/include/utils/ashmem.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/utils/misc.h b/android-headers/13/frameworks/base/include/utils/misc.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/utils/misc.h rename to android-headers/13/frameworks/base/include/utils/misc.h diff --git a/android-headers/android-headers-hc/frameworks/base/include/utils/threads.h b/android-headers/13/frameworks/base/include/utils/threads.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/include/utils/threads.h rename to android-headers/13/frameworks/base/include/utils/threads.h diff --git a/android-headers/android-headers-hc/frameworks/base/native/include/android/asset_manager.h b/android-headers/13/frameworks/base/native/include/android/asset_manager.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/native/include/android/asset_manager.h rename to android-headers/13/frameworks/base/native/include/android/asset_manager.h diff --git a/android-headers/android-headers-hc/frameworks/base/native/include/android/asset_manager_jni.h b/android-headers/13/frameworks/base/native/include/android/asset_manager_jni.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/native/include/android/asset_manager_jni.h rename to android-headers/13/frameworks/base/native/include/android/asset_manager_jni.h diff --git a/android-headers/android-headers-hc/frameworks/base/native/include/android/bitmap.h b/android-headers/13/frameworks/base/native/include/android/bitmap.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/native/include/android/bitmap.h rename to android-headers/13/frameworks/base/native/include/android/bitmap.h diff --git a/android-headers/android-headers-hc/frameworks/base/native/include/android/configuration.h b/android-headers/13/frameworks/base/native/include/android/configuration.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/native/include/android/configuration.h rename to android-headers/13/frameworks/base/native/include/android/configuration.h diff --git a/android-headers/android-headers-hc/frameworks/base/native/include/android/input.h b/android-headers/13/frameworks/base/native/include/android/input.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/native/include/android/input.h rename to android-headers/13/frameworks/base/native/include/android/input.h diff --git a/android-headers/android-headers-hc/frameworks/base/native/include/android/keycodes.h b/android-headers/13/frameworks/base/native/include/android/keycodes.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/native/include/android/keycodes.h rename to android-headers/13/frameworks/base/native/include/android/keycodes.h diff --git a/android-headers/android-headers-hc/frameworks/base/native/include/android/looper.h b/android-headers/13/frameworks/base/native/include/android/looper.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/native/include/android/looper.h rename to android-headers/13/frameworks/base/native/include/android/looper.h diff --git a/android-headers/android-headers-hc/frameworks/base/native/include/android/native_activity.h b/android-headers/13/frameworks/base/native/include/android/native_activity.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/native/include/android/native_activity.h rename to android-headers/13/frameworks/base/native/include/android/native_activity.h diff --git a/android-headers/android-headers-hc/frameworks/base/native/include/android/native_window.h b/android-headers/13/frameworks/base/native/include/android/native_window.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/native/include/android/native_window.h rename to android-headers/13/frameworks/base/native/include/android/native_window.h diff --git a/android-headers/android-headers-hc/frameworks/base/native/include/android/native_window_jni.h b/android-headers/13/frameworks/base/native/include/android/native_window_jni.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/native/include/android/native_window_jni.h rename to android-headers/13/frameworks/base/native/include/android/native_window_jni.h diff --git a/android-headers/android-headers-hc/frameworks/base/native/include/android/obb.h b/android-headers/13/frameworks/base/native/include/android/obb.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/native/include/android/obb.h rename to android-headers/13/frameworks/base/native/include/android/obb.h diff --git a/android-headers/android-headers-hc/frameworks/base/native/include/android/rect.h b/android-headers/13/frameworks/base/native/include/android/rect.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/native/include/android/rect.h rename to android-headers/13/frameworks/base/native/include/android/rect.h diff --git a/android-headers/android-headers-hc/frameworks/base/native/include/android/sensor.h b/android-headers/13/frameworks/base/native/include/android/sensor.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/native/include/android/sensor.h rename to android-headers/13/frameworks/base/native/include/android/sensor.h diff --git a/android-headers/android-headers-hc/frameworks/base/native/include/android/storage_manager.h b/android-headers/13/frameworks/base/native/include/android/storage_manager.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/native/include/android/storage_manager.h rename to android-headers/13/frameworks/base/native/include/android/storage_manager.h diff --git a/android-headers/android-headers-hc/frameworks/base/native/include/android/tts.h b/android-headers/13/frameworks/base/native/include/android/tts.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/native/include/android/tts.h rename to android-headers/13/frameworks/base/native/include/android/tts.h diff --git a/android-headers/android-headers-hc/frameworks/base/native/include/android/window.h b/android-headers/13/frameworks/base/native/include/android/window.h similarity index 100% rename from android-headers/android-headers-hc/frameworks/base/native/include/android/window.h rename to android-headers/13/frameworks/base/native/include/android/window.h diff --git a/android-headers/android-headers-hc/hardware/libhardware/include/hardware/audio.h b/android-headers/13/hardware/libhardware/include/hardware/audio.h similarity index 100% rename from android-headers/android-headers-hc/hardware/libhardware/include/hardware/audio.h rename to android-headers/13/hardware/libhardware/include/hardware/audio.h diff --git a/android-headers/android-headers-hc/hardware/libhardware/include/hardware/audio_hal.h b/android-headers/13/hardware/libhardware/include/hardware/audio_hal.h similarity index 100% rename from android-headers/android-headers-hc/hardware/libhardware/include/hardware/audio_hal.h rename to android-headers/13/hardware/libhardware/include/hardware/audio_hal.h diff --git a/android-headers/android-headers-hc/hardware/libhardware/include/hardware/audio_policy.h b/android-headers/13/hardware/libhardware/include/hardware/audio_policy.h similarity index 100% rename from android-headers/android-headers-hc/hardware/libhardware/include/hardware/audio_policy.h rename to android-headers/13/hardware/libhardware/include/hardware/audio_policy.h diff --git a/android-headers/android-headers-hc/hardware/libhardware/include/hardware/audio_policy_hal.h b/android-headers/13/hardware/libhardware/include/hardware/audio_policy_hal.h similarity index 100% rename from android-headers/android-headers-hc/hardware/libhardware/include/hardware/audio_policy_hal.h rename to android-headers/13/hardware/libhardware/include/hardware/audio_policy_hal.h diff --git a/android-headers/android-headers-hc/hardware/libhardware/include/hardware/camera.h b/android-headers/13/hardware/libhardware/include/hardware/camera.h similarity index 100% rename from android-headers/android-headers-hc/hardware/libhardware/include/hardware/camera.h rename to android-headers/13/hardware/libhardware/include/hardware/camera.h diff --git a/android-headers/android-headers-hc/hardware/libhardware/include/hardware/gps.h b/android-headers/13/hardware/libhardware/include/hardware/gps.h similarity index 100% rename from android-headers/android-headers-hc/hardware/libhardware/include/hardware/gps.h rename to android-headers/13/hardware/libhardware/include/hardware/gps.h diff --git a/android-headers/android-headers-hc/hardware/libhardware/include/hardware/gralloc.h b/android-headers/13/hardware/libhardware/include/hardware/gralloc.h similarity index 100% rename from android-headers/android-headers-hc/hardware/libhardware/include/hardware/gralloc.h rename to android-headers/13/hardware/libhardware/include/hardware/gralloc.h diff --git a/android-headers/android-headers-hc/hardware/libhardware/include/hardware/hardware.h b/android-headers/13/hardware/libhardware/include/hardware/hardware.h similarity index 100% rename from android-headers/android-headers-hc/hardware/libhardware/include/hardware/hardware.h rename to android-headers/13/hardware/libhardware/include/hardware/hardware.h diff --git a/android-headers/android-headers-hc/hardware/libhardware/include/hardware/hwcomposer.h b/android-headers/13/hardware/libhardware/include/hardware/hwcomposer.h similarity index 100% rename from android-headers/android-headers-hc/hardware/libhardware/include/hardware/hwcomposer.h rename to android-headers/13/hardware/libhardware/include/hardware/hwcomposer.h diff --git a/android-headers/android-headers-hc/hardware/libhardware/include/hardware/lights.h b/android-headers/13/hardware/libhardware/include/hardware/lights.h similarity index 100% rename from android-headers/android-headers-hc/hardware/libhardware/include/hardware/lights.h rename to android-headers/13/hardware/libhardware/include/hardware/lights.h diff --git a/android-headers/android-headers-hc/hardware/libhardware/include/hardware/qemu_pipe.h b/android-headers/13/hardware/libhardware/include/hardware/qemu_pipe.h similarity index 100% rename from android-headers/android-headers-hc/hardware/libhardware/include/hardware/qemu_pipe.h rename to android-headers/13/hardware/libhardware/include/hardware/qemu_pipe.h diff --git a/android-headers/android-headers-hc/hardware/libhardware/include/hardware/qemud.h b/android-headers/13/hardware/libhardware/include/hardware/qemud.h similarity index 100% rename from android-headers/android-headers-hc/hardware/libhardware/include/hardware/qemud.h rename to android-headers/13/hardware/libhardware/include/hardware/qemud.h diff --git a/android-headers/android-headers-hc/hardware/libhardware/include/hardware/sensors.h b/android-headers/13/hardware/libhardware/include/hardware/sensors.h similarity index 100% rename from android-headers/android-headers-hc/hardware/libhardware/include/hardware/sensors.h rename to android-headers/13/hardware/libhardware/include/hardware/sensors.h diff --git a/android-headers/android-headers-hc/system/core/include/android/log.h b/android-headers/13/system/core/include/android/log.h similarity index 100% rename from android-headers/android-headers-hc/system/core/include/android/log.h rename to android-headers/13/system/core/include/android/log.h diff --git a/android-headers/android-headers-hc/system/core/include/arch/darwin-x86/AndroidConfig.h b/android-headers/13/system/core/include/arch/darwin-x86/AndroidConfig.h similarity index 100% rename from android-headers/android-headers-hc/system/core/include/arch/darwin-x86/AndroidConfig.h rename to android-headers/13/system/core/include/arch/darwin-x86/AndroidConfig.h diff --git a/android-headers/android-headers-hc/system/core/include/arch/freebsd-x86/AndroidConfig.h b/android-headers/13/system/core/include/arch/freebsd-x86/AndroidConfig.h similarity index 100% rename from android-headers/android-headers-hc/system/core/include/arch/freebsd-x86/AndroidConfig.h rename to android-headers/13/system/core/include/arch/freebsd-x86/AndroidConfig.h diff --git a/android-headers/android-headers-hc/system/core/include/arch/linux-arm/AndroidConfig.h b/android-headers/13/system/core/include/arch/linux-arm/AndroidConfig.h similarity index 100% rename from android-headers/android-headers-hc/system/core/include/arch/linux-arm/AndroidConfig.h rename to android-headers/13/system/core/include/arch/linux-arm/AndroidConfig.h diff --git a/android-headers/android-headers-hc/system/core/include/arch/linux-ppc/AndroidConfig.h b/android-headers/13/system/core/include/arch/linux-ppc/AndroidConfig.h similarity index 100% rename from android-headers/android-headers-hc/system/core/include/arch/linux-ppc/AndroidConfig.h rename to android-headers/13/system/core/include/arch/linux-ppc/AndroidConfig.h diff --git a/android-headers/android-headers-hc/system/core/include/arch/linux-sh/AndroidConfig.h b/android-headers/13/system/core/include/arch/linux-sh/AndroidConfig.h similarity index 100% rename from android-headers/android-headers-hc/system/core/include/arch/linux-sh/AndroidConfig.h rename to android-headers/13/system/core/include/arch/linux-sh/AndroidConfig.h diff --git a/android-headers/android-headers-hc/system/core/include/arch/linux-x86/AndroidConfig.h b/android-headers/13/system/core/include/arch/linux-x86/AndroidConfig.h similarity index 100% rename from android-headers/android-headers-hc/system/core/include/arch/linux-x86/AndroidConfig.h rename to android-headers/13/system/core/include/arch/linux-x86/AndroidConfig.h diff --git a/android-headers/android-headers-hc/system/core/include/arch/target_linux-x86/AndroidConfig.h b/android-headers/13/system/core/include/arch/target_linux-x86/AndroidConfig.h similarity index 100% rename from android-headers/android-headers-hc/system/core/include/arch/target_linux-x86/AndroidConfig.h rename to android-headers/13/system/core/include/arch/target_linux-x86/AndroidConfig.h diff --git a/android-headers/android-headers-hc/system/core/include/arch/windows/AndroidConfig.h b/android-headers/13/system/core/include/arch/windows/AndroidConfig.h similarity index 100% rename from android-headers/android-headers-hc/system/core/include/arch/windows/AndroidConfig.h rename to android-headers/13/system/core/include/arch/windows/AndroidConfig.h diff --git a/android-headers/android-headers-hc/system/core/include/ctest/ctest.h b/android-headers/13/system/core/include/ctest/ctest.h similarity index 100% rename from android-headers/android-headers-hc/system/core/include/ctest/ctest.h rename to android-headers/13/system/core/include/ctest/ctest.h diff --git a/android-headers/android-headers-hc/system/core/include/cutils/abort_socket.h b/android-headers/13/system/core/include/cutils/abort_socket.h similarity index 100% rename from android-headers/android-headers-hc/system/core/include/cutils/abort_socket.h rename to android-headers/13/system/core/include/cutils/abort_socket.h diff --git a/android-headers/android-headers-hc/system/core/include/cutils/android_reboot.h b/android-headers/13/system/core/include/cutils/android_reboot.h similarity index 100% rename from android-headers/android-headers-hc/system/core/include/cutils/android_reboot.h rename to android-headers/13/system/core/include/cutils/android_reboot.h diff --git a/android-headers/android-headers-hc/system/core/include/cutils/array.h b/android-headers/13/system/core/include/cutils/array.h similarity index 100% rename from android-headers/android-headers-hc/system/core/include/cutils/array.h rename to android-headers/13/system/core/include/cutils/array.h diff --git a/android-headers/android-headers-hc/system/core/include/cutils/ashmem.h b/android-headers/13/system/core/include/cutils/ashmem.h similarity index 100% rename from android-headers/android-headers-hc/system/core/include/cutils/ashmem.h rename to android-headers/13/system/core/include/cutils/ashmem.h diff --git a/android-headers/android-headers-hc/system/core/include/cutils/atomic-arm.h b/android-headers/13/system/core/include/cutils/atomic-arm.h similarity index 100% rename from android-headers/android-headers-hc/system/core/include/cutils/atomic-arm.h rename to android-headers/13/system/core/include/cutils/atomic-arm.h diff --git a/android-headers/android-headers-hc/system/core/include/cutils/atomic-inline.h b/android-headers/13/system/core/include/cutils/atomic-inline.h similarity index 100% rename from android-headers/android-headers-hc/system/core/include/cutils/atomic-inline.h rename to android-headers/13/system/core/include/cutils/atomic-inline.h diff --git a/android-headers/android-headers-hc/system/core/include/cutils/atomic-x86.h b/android-headers/13/system/core/include/cutils/atomic-x86.h similarity index 100% rename from android-headers/android-headers-hc/system/core/include/cutils/atomic-x86.h rename to android-headers/13/system/core/include/cutils/atomic-x86.h diff --git a/android-headers/android-headers-hc/system/core/include/cutils/atomic.h b/android-headers/13/system/core/include/cutils/atomic.h similarity index 100% rename from android-headers/android-headers-hc/system/core/include/cutils/atomic.h rename to android-headers/13/system/core/include/cutils/atomic.h diff --git a/android-headers/android-headers-hc/system/core/include/cutils/bitops.h b/android-headers/13/system/core/include/cutils/bitops.h similarity index 100% rename from android-headers/android-headers-hc/system/core/include/cutils/bitops.h rename to android-headers/13/system/core/include/cutils/bitops.h diff --git a/android-headers/android-headers-hc/system/core/include/cutils/compiler.h b/android-headers/13/system/core/include/cutils/compiler.h similarity index 100% rename from android-headers/android-headers-hc/system/core/include/cutils/compiler.h rename to android-headers/13/system/core/include/cutils/compiler.h diff --git a/android-headers/android-headers-hc/system/core/include/cutils/config_utils.h b/android-headers/13/system/core/include/cutils/config_utils.h similarity index 100% rename from android-headers/android-headers-hc/system/core/include/cutils/config_utils.h rename to android-headers/13/system/core/include/cutils/config_utils.h diff --git a/android-headers/android-headers-hc/system/core/include/cutils/cpu_info.h b/android-headers/13/system/core/include/cutils/cpu_info.h similarity index 100% rename from android-headers/android-headers-hc/system/core/include/cutils/cpu_info.h rename to android-headers/13/system/core/include/cutils/cpu_info.h diff --git a/android-headers/android-headers-hc/system/core/include/cutils/dir_hash.h b/android-headers/13/system/core/include/cutils/dir_hash.h similarity index 100% rename from android-headers/android-headers-hc/system/core/include/cutils/dir_hash.h rename to android-headers/13/system/core/include/cutils/dir_hash.h diff --git a/android-headers/android-headers-hc/system/core/include/cutils/event_tag_map.h b/android-headers/13/system/core/include/cutils/event_tag_map.h similarity index 100% rename from android-headers/android-headers-hc/system/core/include/cutils/event_tag_map.h rename to android-headers/13/system/core/include/cutils/event_tag_map.h diff --git a/android-headers/android-headers-hc/system/core/include/cutils/hashmap.h b/android-headers/13/system/core/include/cutils/hashmap.h similarity index 100% rename from android-headers/android-headers-hc/system/core/include/cutils/hashmap.h rename to android-headers/13/system/core/include/cutils/hashmap.h diff --git a/android-headers/android-headers-hc/system/core/include/cutils/iosched_policy.h b/android-headers/13/system/core/include/cutils/iosched_policy.h similarity index 100% rename from android-headers/android-headers-hc/system/core/include/cutils/iosched_policy.h rename to android-headers/13/system/core/include/cutils/iosched_policy.h diff --git a/android-headers/android-headers-hc/system/core/include/cutils/jstring.h b/android-headers/13/system/core/include/cutils/jstring.h similarity index 100% rename from android-headers/android-headers-hc/system/core/include/cutils/jstring.h rename to android-headers/13/system/core/include/cutils/jstring.h diff --git a/android-headers/android-headers-hc/system/core/include/cutils/klog.h b/android-headers/13/system/core/include/cutils/klog.h similarity index 100% rename from android-headers/android-headers-hc/system/core/include/cutils/klog.h rename to android-headers/13/system/core/include/cutils/klog.h diff --git a/android-headers/android-headers-hc/system/core/include/cutils/list.h b/android-headers/13/system/core/include/cutils/list.h similarity index 100% rename from android-headers/android-headers-hc/system/core/include/cutils/list.h rename to android-headers/13/system/core/include/cutils/list.h diff --git a/android-headers/android-headers-hc/system/core/include/cutils/log.h b/android-headers/13/system/core/include/cutils/log.h similarity index 100% rename from android-headers/android-headers-hc/system/core/include/cutils/log.h rename to android-headers/13/system/core/include/cutils/log.h diff --git a/android-headers/android-headers-hc/system/core/include/cutils/logd.h b/android-headers/13/system/core/include/cutils/logd.h similarity index 100% rename from android-headers/android-headers-hc/system/core/include/cutils/logd.h rename to android-headers/13/system/core/include/cutils/logd.h diff --git a/android-headers/android-headers-hc/system/core/include/cutils/logger.h b/android-headers/13/system/core/include/cutils/logger.h similarity index 100% rename from android-headers/android-headers-hc/system/core/include/cutils/logger.h rename to android-headers/13/system/core/include/cutils/logger.h diff --git a/android-headers/android-headers-hc/system/core/include/cutils/logprint.h b/android-headers/13/system/core/include/cutils/logprint.h similarity index 100% rename from android-headers/android-headers-hc/system/core/include/cutils/logprint.h rename to android-headers/13/system/core/include/cutils/logprint.h diff --git a/android-headers/android-headers-hc/system/core/include/cutils/memory.h b/android-headers/13/system/core/include/cutils/memory.h similarity index 100% rename from android-headers/android-headers-hc/system/core/include/cutils/memory.h rename to android-headers/13/system/core/include/cutils/memory.h diff --git a/android-headers/android-headers-hc/system/core/include/cutils/misc.h b/android-headers/13/system/core/include/cutils/misc.h similarity index 100% rename from android-headers/android-headers-hc/system/core/include/cutils/misc.h rename to android-headers/13/system/core/include/cutils/misc.h diff --git a/android-headers/android-headers-hc/system/core/include/cutils/mq.h b/android-headers/13/system/core/include/cutils/mq.h similarity index 100% rename from android-headers/android-headers-hc/system/core/include/cutils/mq.h rename to android-headers/13/system/core/include/cutils/mq.h diff --git a/android-headers/android-headers-hc/system/core/include/cutils/mspace.h b/android-headers/13/system/core/include/cutils/mspace.h similarity index 100% rename from android-headers/android-headers-hc/system/core/include/cutils/mspace.h rename to android-headers/13/system/core/include/cutils/mspace.h diff --git a/android-headers/android-headers-hc/system/core/include/cutils/native_handle.h b/android-headers/13/system/core/include/cutils/native_handle.h similarity index 100% rename from android-headers/android-headers-hc/system/core/include/cutils/native_handle.h rename to android-headers/13/system/core/include/cutils/native_handle.h diff --git a/android-headers/android-headers-hc/system/core/include/cutils/open_memstream.h b/android-headers/13/system/core/include/cutils/open_memstream.h similarity index 100% rename from android-headers/android-headers-hc/system/core/include/cutils/open_memstream.h rename to android-headers/13/system/core/include/cutils/open_memstream.h diff --git a/android-headers/android-headers-hc/system/core/include/cutils/partition_utils.h b/android-headers/13/system/core/include/cutils/partition_utils.h similarity index 100% rename from android-headers/android-headers-hc/system/core/include/cutils/partition_utils.h rename to android-headers/13/system/core/include/cutils/partition_utils.h diff --git a/android-headers/android-headers-hc/system/core/include/cutils/process_name.h b/android-headers/13/system/core/include/cutils/process_name.h similarity index 100% rename from android-headers/android-headers-hc/system/core/include/cutils/process_name.h rename to android-headers/13/system/core/include/cutils/process_name.h diff --git a/android-headers/android-headers-hc/system/core/include/cutils/properties.h b/android-headers/13/system/core/include/cutils/properties.h similarity index 100% rename from android-headers/android-headers-hc/system/core/include/cutils/properties.h rename to android-headers/13/system/core/include/cutils/properties.h diff --git a/android-headers/android-headers-hc/system/core/include/cutils/qtaguid.h b/android-headers/13/system/core/include/cutils/qtaguid.h similarity index 100% rename from android-headers/android-headers-hc/system/core/include/cutils/qtaguid.h rename to android-headers/13/system/core/include/cutils/qtaguid.h diff --git a/android-headers/android-headers-hc/system/core/include/cutils/record_stream.h b/android-headers/13/system/core/include/cutils/record_stream.h similarity index 100% rename from android-headers/android-headers-hc/system/core/include/cutils/record_stream.h rename to android-headers/13/system/core/include/cutils/record_stream.h diff --git a/android-headers/android-headers-hc/system/core/include/cutils/sched_policy.h b/android-headers/13/system/core/include/cutils/sched_policy.h similarity index 100% rename from android-headers/android-headers-hc/system/core/include/cutils/sched_policy.h rename to android-headers/13/system/core/include/cutils/sched_policy.h diff --git a/android-headers/android-headers-hc/system/core/include/cutils/selector.h b/android-headers/13/system/core/include/cutils/selector.h similarity index 100% rename from android-headers/android-headers-hc/system/core/include/cutils/selector.h rename to android-headers/13/system/core/include/cutils/selector.h diff --git a/android-headers/android-headers-hc/system/core/include/cutils/sockets.h b/android-headers/13/system/core/include/cutils/sockets.h similarity index 100% rename from android-headers/android-headers-hc/system/core/include/cutils/sockets.h rename to android-headers/13/system/core/include/cutils/sockets.h diff --git a/android-headers/android-headers-hc/system/core/include/cutils/str_parms.h b/android-headers/13/system/core/include/cutils/str_parms.h similarity index 100% rename from android-headers/android-headers-hc/system/core/include/cutils/str_parms.h rename to android-headers/13/system/core/include/cutils/str_parms.h diff --git a/android-headers/android-headers-hc/system/core/include/cutils/threads.h b/android-headers/13/system/core/include/cutils/threads.h similarity index 100% rename from android-headers/android-headers-hc/system/core/include/cutils/threads.h rename to android-headers/13/system/core/include/cutils/threads.h diff --git a/android-headers/android-headers-hc/system/core/include/cutils/tztime.h b/android-headers/13/system/core/include/cutils/tztime.h similarity index 100% rename from android-headers/android-headers-hc/system/core/include/cutils/tztime.h rename to android-headers/13/system/core/include/cutils/tztime.h diff --git a/android-headers/android-headers-hc/system/core/include/cutils/uevent.h b/android-headers/13/system/core/include/cutils/uevent.h similarity index 100% rename from android-headers/android-headers-hc/system/core/include/cutils/uevent.h rename to android-headers/13/system/core/include/cutils/uevent.h diff --git a/android-headers/android-headers-hc/system/core/include/cutils/uio.h b/android-headers/13/system/core/include/cutils/uio.h similarity index 100% rename from android-headers/android-headers-hc/system/core/include/cutils/uio.h rename to android-headers/13/system/core/include/cutils/uio.h diff --git a/android-headers/android-headers-hc/system/core/include/cutils/zygote.h b/android-headers/13/system/core/include/cutils/zygote.h similarity index 100% rename from android-headers/android-headers-hc/system/core/include/cutils/zygote.h rename to android-headers/13/system/core/include/cutils/zygote.h diff --git a/android-headers/android-headers-hc/system/core/include/diskconfig/diskconfig.h b/android-headers/13/system/core/include/diskconfig/diskconfig.h similarity index 100% rename from android-headers/android-headers-hc/system/core/include/diskconfig/diskconfig.h rename to android-headers/13/system/core/include/diskconfig/diskconfig.h diff --git a/android-headers/android-headers-hc/system/core/include/mincrypt/rsa.h b/android-headers/13/system/core/include/mincrypt/rsa.h similarity index 100% rename from android-headers/android-headers-hc/system/core/include/mincrypt/rsa.h rename to android-headers/13/system/core/include/mincrypt/rsa.h diff --git a/android-headers/android-headers-hc/system/core/include/mincrypt/sha.h b/android-headers/13/system/core/include/mincrypt/sha.h similarity index 100% rename from android-headers/android-headers-hc/system/core/include/mincrypt/sha.h rename to android-headers/13/system/core/include/mincrypt/sha.h diff --git a/android-headers/android-headers-hc/system/core/include/netutils/dhcp.h b/android-headers/13/system/core/include/netutils/dhcp.h similarity index 100% rename from android-headers/android-headers-hc/system/core/include/netutils/dhcp.h rename to android-headers/13/system/core/include/netutils/dhcp.h diff --git a/android-headers/android-headers-hc/system/core/include/netutils/ifc.h b/android-headers/13/system/core/include/netutils/ifc.h similarity index 100% rename from android-headers/android-headers-hc/system/core/include/netutils/ifc.h rename to android-headers/13/system/core/include/netutils/ifc.h diff --git a/android-headers/android-headers-hc/system/core/include/pixelflinger/format.h b/android-headers/13/system/core/include/pixelflinger/format.h similarity index 100% rename from android-headers/android-headers-hc/system/core/include/pixelflinger/format.h rename to android-headers/13/system/core/include/pixelflinger/format.h diff --git a/android-headers/android-headers-hc/system/core/include/pixelflinger/pixelflinger.h b/android-headers/13/system/core/include/pixelflinger/pixelflinger.h similarity index 100% rename from android-headers/android-headers-hc/system/core/include/pixelflinger/pixelflinger.h rename to android-headers/13/system/core/include/pixelflinger/pixelflinger.h diff --git a/android-headers/android-headers-hc/system/core/include/private/android_filesystem_config.h b/android-headers/13/system/core/include/private/android_filesystem_config.h similarity index 100% rename from android-headers/android-headers-hc/system/core/include/private/android_filesystem_config.h rename to android-headers/13/system/core/include/private/android_filesystem_config.h diff --git a/android-headers/android-headers-hc/system/core/include/private/pixelflinger/ggl_context.h b/android-headers/13/system/core/include/private/pixelflinger/ggl_context.h similarity index 100% rename from android-headers/android-headers-hc/system/core/include/private/pixelflinger/ggl_context.h rename to android-headers/13/system/core/include/private/pixelflinger/ggl_context.h diff --git a/android-headers/android-headers-hc/system/core/include/private/pixelflinger/ggl_fixed.h b/android-headers/13/system/core/include/private/pixelflinger/ggl_fixed.h similarity index 100% rename from android-headers/android-headers-hc/system/core/include/private/pixelflinger/ggl_fixed.h rename to android-headers/13/system/core/include/private/pixelflinger/ggl_fixed.h diff --git a/android-headers/android-headers-hc/system/core/include/system/audio.h b/android-headers/13/system/core/include/system/audio.h similarity index 100% rename from android-headers/android-headers-hc/system/core/include/system/audio.h rename to android-headers/13/system/core/include/system/audio.h diff --git a/android-headers/android-headers-hc/system/core/include/system/audio_policy.h b/android-headers/13/system/core/include/system/audio_policy.h similarity index 100% rename from android-headers/android-headers-hc/system/core/include/system/audio_policy.h rename to android-headers/13/system/core/include/system/audio_policy.h diff --git a/android-headers/android-headers-hc/system/core/include/system/camera.h b/android-headers/13/system/core/include/system/camera.h similarity index 100% rename from android-headers/android-headers-hc/system/core/include/system/camera.h rename to android-headers/13/system/core/include/system/camera.h diff --git a/android-headers/android-headers-hc/system/core/include/system/graphics.h b/android-headers/13/system/core/include/system/graphics.h similarity index 100% rename from android-headers/android-headers-hc/system/core/include/system/graphics.h rename to android-headers/13/system/core/include/system/graphics.h diff --git a/android-headers/android-headers-hc/system/core/include/system/window.h b/android-headers/13/system/core/include/system/window.h similarity index 100% rename from android-headers/android-headers-hc/system/core/include/system/window.h rename to android-headers/13/system/core/include/system/window.h diff --git a/android-headers/android-headers-hc/system/core/include/sysutils/FrameworkClient.h b/android-headers/13/system/core/include/sysutils/FrameworkClient.h similarity index 100% rename from android-headers/android-headers-hc/system/core/include/sysutils/FrameworkClient.h rename to android-headers/13/system/core/include/sysutils/FrameworkClient.h diff --git a/android-headers/android-headers-hc/system/core/include/sysutils/FrameworkCommand.h b/android-headers/13/system/core/include/sysutils/FrameworkCommand.h similarity index 100% rename from android-headers/android-headers-hc/system/core/include/sysutils/FrameworkCommand.h rename to android-headers/13/system/core/include/sysutils/FrameworkCommand.h diff --git a/android-headers/android-headers-hc/system/core/include/sysutils/FrameworkListener.h b/android-headers/13/system/core/include/sysutils/FrameworkListener.h similarity index 100% rename from android-headers/android-headers-hc/system/core/include/sysutils/FrameworkListener.h rename to android-headers/13/system/core/include/sysutils/FrameworkListener.h diff --git a/android-headers/android-headers-hc/system/core/include/sysutils/NetlinkEvent.h b/android-headers/13/system/core/include/sysutils/NetlinkEvent.h similarity index 100% rename from android-headers/android-headers-hc/system/core/include/sysutils/NetlinkEvent.h rename to android-headers/13/system/core/include/sysutils/NetlinkEvent.h diff --git a/android-headers/android-headers-hc/system/core/include/sysutils/NetlinkListener.h b/android-headers/13/system/core/include/sysutils/NetlinkListener.h similarity index 100% rename from android-headers/android-headers-hc/system/core/include/sysutils/NetlinkListener.h rename to android-headers/13/system/core/include/sysutils/NetlinkListener.h diff --git a/android-headers/android-headers-hc/system/core/include/sysutils/ServiceManager.h b/android-headers/13/system/core/include/sysutils/ServiceManager.h similarity index 100% rename from android-headers/android-headers-hc/system/core/include/sysutils/ServiceManager.h rename to android-headers/13/system/core/include/sysutils/ServiceManager.h diff --git a/android-headers/android-headers-hc/system/core/include/sysutils/SocketClient.h b/android-headers/13/system/core/include/sysutils/SocketClient.h similarity index 100% rename from android-headers/android-headers-hc/system/core/include/sysutils/SocketClient.h rename to android-headers/13/system/core/include/sysutils/SocketClient.h diff --git a/android-headers/android-headers-hc/system/core/include/sysutils/SocketListener.h b/android-headers/13/system/core/include/sysutils/SocketListener.h similarity index 100% rename from android-headers/android-headers-hc/system/core/include/sysutils/SocketListener.h rename to android-headers/13/system/core/include/sysutils/SocketListener.h diff --git a/android-headers/android-headers-hc/system/core/include/usbhost/usbhost.h b/android-headers/13/system/core/include/usbhost/usbhost.h similarity index 100% rename from android-headers/android-headers-hc/system/core/include/usbhost/usbhost.h rename to android-headers/13/system/core/include/usbhost/usbhost.h diff --git a/android-headers/android-headers-hc/system/core/include/zipfile/zipfile.h b/android-headers/13/system/core/include/zipfile/zipfile.h similarity index 100% rename from android-headers/android-headers-hc/system/core/include/zipfile/zipfile.h rename to android-headers/13/system/core/include/zipfile/zipfile.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/android_runtime/ActivityManager.h b/android-headers/14/frameworks/base/include/android_runtime/ActivityManager.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/android_runtime/ActivityManager.h rename to android-headers/14/frameworks/base/include/android_runtime/ActivityManager.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/android_runtime/AndroidRuntime.h b/android-headers/14/frameworks/base/include/android_runtime/AndroidRuntime.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/android_runtime/AndroidRuntime.h rename to android-headers/14/frameworks/base/include/android_runtime/AndroidRuntime.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/android_runtime/android_app_NativeActivity.h b/android-headers/14/frameworks/base/include/android_runtime/android_app_NativeActivity.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/android_runtime/android_app_NativeActivity.h rename to android-headers/14/frameworks/base/include/android_runtime/android_app_NativeActivity.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/android_runtime/android_content_res_Configuration.h b/android-headers/14/frameworks/base/include/android_runtime/android_content_res_Configuration.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/android_runtime/android_content_res_Configuration.h rename to android-headers/14/frameworks/base/include/android_runtime/android_content_res_Configuration.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/android_runtime/android_graphics_SurfaceTexture.h b/android-headers/14/frameworks/base/include/android_runtime/android_graphics_SurfaceTexture.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/android_runtime/android_graphics_SurfaceTexture.h rename to android-headers/14/frameworks/base/include/android_runtime/android_graphics_SurfaceTexture.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/android_runtime/android_util_AssetManager.h b/android-headers/14/frameworks/base/include/android_runtime/android_util_AssetManager.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/android_runtime/android_util_AssetManager.h rename to android-headers/14/frameworks/base/include/android_runtime/android_util_AssetManager.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/android_runtime/android_view_Surface.h b/android-headers/14/frameworks/base/include/android_runtime/android_view_Surface.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/android_runtime/android_view_Surface.h rename to android-headers/14/frameworks/base/include/android_runtime/android_view_Surface.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/binder/Binder.h b/android-headers/14/frameworks/base/include/binder/Binder.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/binder/Binder.h rename to android-headers/14/frameworks/base/include/binder/Binder.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/binder/BinderService.h b/android-headers/14/frameworks/base/include/binder/BinderService.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/binder/BinderService.h rename to android-headers/14/frameworks/base/include/binder/BinderService.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/binder/BpBinder.h b/android-headers/14/frameworks/base/include/binder/BpBinder.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/binder/BpBinder.h rename to android-headers/14/frameworks/base/include/binder/BpBinder.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/binder/CursorWindow.h b/android-headers/14/frameworks/base/include/binder/CursorWindow.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/binder/CursorWindow.h rename to android-headers/14/frameworks/base/include/binder/CursorWindow.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/binder/IBinder.h b/android-headers/14/frameworks/base/include/binder/IBinder.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/binder/IBinder.h rename to android-headers/14/frameworks/base/include/binder/IBinder.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/binder/IInterface.h b/android-headers/14/frameworks/base/include/binder/IInterface.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/binder/IInterface.h rename to android-headers/14/frameworks/base/include/binder/IInterface.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/binder/IMemory.h b/android-headers/14/frameworks/base/include/binder/IMemory.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/binder/IMemory.h rename to android-headers/14/frameworks/base/include/binder/IMemory.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/binder/IPCThreadState.h b/android-headers/14/frameworks/base/include/binder/IPCThreadState.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/binder/IPCThreadState.h rename to android-headers/14/frameworks/base/include/binder/IPCThreadState.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/binder/IPermissionController.h b/android-headers/14/frameworks/base/include/binder/IPermissionController.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/binder/IPermissionController.h rename to android-headers/14/frameworks/base/include/binder/IPermissionController.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/binder/IServiceManager.h b/android-headers/14/frameworks/base/include/binder/IServiceManager.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/binder/IServiceManager.h rename to android-headers/14/frameworks/base/include/binder/IServiceManager.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/binder/MemoryBase.h b/android-headers/14/frameworks/base/include/binder/MemoryBase.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/binder/MemoryBase.h rename to android-headers/14/frameworks/base/include/binder/MemoryBase.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/binder/MemoryDealer.h b/android-headers/14/frameworks/base/include/binder/MemoryDealer.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/binder/MemoryDealer.h rename to android-headers/14/frameworks/base/include/binder/MemoryDealer.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/binder/MemoryHeapBase.h b/android-headers/14/frameworks/base/include/binder/MemoryHeapBase.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/binder/MemoryHeapBase.h rename to android-headers/14/frameworks/base/include/binder/MemoryHeapBase.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/binder/MemoryHeapPmem.h b/android-headers/14/frameworks/base/include/binder/MemoryHeapPmem.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/binder/MemoryHeapPmem.h rename to android-headers/14/frameworks/base/include/binder/MemoryHeapPmem.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/binder/Parcel.h b/android-headers/14/frameworks/base/include/binder/Parcel.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/binder/Parcel.h rename to android-headers/14/frameworks/base/include/binder/Parcel.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/binder/PermissionCache.h b/android-headers/14/frameworks/base/include/binder/PermissionCache.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/binder/PermissionCache.h rename to android-headers/14/frameworks/base/include/binder/PermissionCache.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/binder/ProcessState.h b/android-headers/14/frameworks/base/include/binder/ProcessState.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/binder/ProcessState.h rename to android-headers/14/frameworks/base/include/binder/ProcessState.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/camera/Camera.h b/android-headers/14/frameworks/base/include/camera/Camera.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/camera/Camera.h rename to android-headers/14/frameworks/base/include/camera/Camera.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/camera/CameraParameters.h b/android-headers/14/frameworks/base/include/camera/CameraParameters.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/camera/CameraParameters.h rename to android-headers/14/frameworks/base/include/camera/CameraParameters.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/camera/ICamera.h b/android-headers/14/frameworks/base/include/camera/ICamera.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/camera/ICamera.h rename to android-headers/14/frameworks/base/include/camera/ICamera.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/camera/ICameraClient.h b/android-headers/14/frameworks/base/include/camera/ICameraClient.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/camera/ICameraClient.h rename to android-headers/14/frameworks/base/include/camera/ICameraClient.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/camera/ICameraRecordingProxy.h b/android-headers/14/frameworks/base/include/camera/ICameraRecordingProxy.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/camera/ICameraRecordingProxy.h rename to android-headers/14/frameworks/base/include/camera/ICameraRecordingProxy.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/camera/ICameraRecordingProxyListener.h b/android-headers/14/frameworks/base/include/camera/ICameraRecordingProxyListener.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/camera/ICameraRecordingProxyListener.h rename to android-headers/14/frameworks/base/include/camera/ICameraRecordingProxyListener.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/camera/ICameraService.h b/android-headers/14/frameworks/base/include/camera/ICameraService.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/camera/ICameraService.h rename to android-headers/14/frameworks/base/include/camera/ICameraService.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/cpustats/CentralTendencyStatistics.h b/android-headers/14/frameworks/base/include/cpustats/CentralTendencyStatistics.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/cpustats/CentralTendencyStatistics.h rename to android-headers/14/frameworks/base/include/cpustats/CentralTendencyStatistics.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/cpustats/README.txt b/android-headers/14/frameworks/base/include/cpustats/README.txt similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/cpustats/README.txt rename to android-headers/14/frameworks/base/include/cpustats/README.txt diff --git a/android-headers/android-headers-ics/frameworks/base/include/cpustats/ThreadCpuUsage.h b/android-headers/14/frameworks/base/include/cpustats/ThreadCpuUsage.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/cpustats/ThreadCpuUsage.h rename to android-headers/14/frameworks/base/include/cpustats/ThreadCpuUsage.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/diskusage/dirsize.h b/android-headers/14/frameworks/base/include/diskusage/dirsize.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/diskusage/dirsize.h rename to android-headers/14/frameworks/base/include/diskusage/dirsize.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/drm/DrmConstraints.h b/android-headers/14/frameworks/base/include/drm/DrmConstraints.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/drm/DrmConstraints.h rename to android-headers/14/frameworks/base/include/drm/DrmConstraints.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/drm/DrmConvertedStatus.h b/android-headers/14/frameworks/base/include/drm/DrmConvertedStatus.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/drm/DrmConvertedStatus.h rename to android-headers/14/frameworks/base/include/drm/DrmConvertedStatus.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/drm/DrmInfo.h b/android-headers/14/frameworks/base/include/drm/DrmInfo.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/drm/DrmInfo.h rename to android-headers/14/frameworks/base/include/drm/DrmInfo.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/drm/DrmInfoEvent.h b/android-headers/14/frameworks/base/include/drm/DrmInfoEvent.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/drm/DrmInfoEvent.h rename to android-headers/14/frameworks/base/include/drm/DrmInfoEvent.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/drm/DrmInfoRequest.h b/android-headers/14/frameworks/base/include/drm/DrmInfoRequest.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/drm/DrmInfoRequest.h rename to android-headers/14/frameworks/base/include/drm/DrmInfoRequest.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/drm/DrmInfoStatus.h b/android-headers/14/frameworks/base/include/drm/DrmInfoStatus.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/drm/DrmInfoStatus.h rename to android-headers/14/frameworks/base/include/drm/DrmInfoStatus.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/drm/DrmManagerClient.h b/android-headers/14/frameworks/base/include/drm/DrmManagerClient.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/drm/DrmManagerClient.h rename to android-headers/14/frameworks/base/include/drm/DrmManagerClient.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/drm/DrmMetadata.h b/android-headers/14/frameworks/base/include/drm/DrmMetadata.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/drm/DrmMetadata.h rename to android-headers/14/frameworks/base/include/drm/DrmMetadata.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/drm/DrmRights.h b/android-headers/14/frameworks/base/include/drm/DrmRights.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/drm/DrmRights.h rename to android-headers/14/frameworks/base/include/drm/DrmRights.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/drm/DrmSupportInfo.h b/android-headers/14/frameworks/base/include/drm/DrmSupportInfo.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/drm/DrmSupportInfo.h rename to android-headers/14/frameworks/base/include/drm/DrmSupportInfo.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/drm/drm_framework_common.h b/android-headers/14/frameworks/base/include/drm/drm_framework_common.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/drm/drm_framework_common.h rename to android-headers/14/frameworks/base/include/drm/drm_framework_common.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/gui/ISensorEventConnection.h b/android-headers/14/frameworks/base/include/gui/ISensorEventConnection.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/gui/ISensorEventConnection.h rename to android-headers/14/frameworks/base/include/gui/ISensorEventConnection.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/gui/ISensorServer.h b/android-headers/14/frameworks/base/include/gui/ISensorServer.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/gui/ISensorServer.h rename to android-headers/14/frameworks/base/include/gui/ISensorServer.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/gui/ISurfaceTexture.h b/android-headers/14/frameworks/base/include/gui/ISurfaceTexture.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/gui/ISurfaceTexture.h rename to android-headers/14/frameworks/base/include/gui/ISurfaceTexture.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/gui/Sensor.h b/android-headers/14/frameworks/base/include/gui/Sensor.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/gui/Sensor.h rename to android-headers/14/frameworks/base/include/gui/Sensor.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/gui/SensorChannel.h b/android-headers/14/frameworks/base/include/gui/SensorChannel.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/gui/SensorChannel.h rename to android-headers/14/frameworks/base/include/gui/SensorChannel.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/gui/SensorEventQueue.h b/android-headers/14/frameworks/base/include/gui/SensorEventQueue.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/gui/SensorEventQueue.h rename to android-headers/14/frameworks/base/include/gui/SensorEventQueue.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/gui/SensorManager.h b/android-headers/14/frameworks/base/include/gui/SensorManager.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/gui/SensorManager.h rename to android-headers/14/frameworks/base/include/gui/SensorManager.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/gui/SurfaceTexture.h b/android-headers/14/frameworks/base/include/gui/SurfaceTexture.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/gui/SurfaceTexture.h rename to android-headers/14/frameworks/base/include/gui/SurfaceTexture.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/gui/SurfaceTextureClient.h b/android-headers/14/frameworks/base/include/gui/SurfaceTextureClient.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/gui/SurfaceTextureClient.h rename to android-headers/14/frameworks/base/include/gui/SurfaceTextureClient.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/media/AudioEffect.h b/android-headers/14/frameworks/base/include/media/AudioEffect.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/media/AudioEffect.h rename to android-headers/14/frameworks/base/include/media/AudioEffect.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/media/AudioParameter.h b/android-headers/14/frameworks/base/include/media/AudioParameter.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/media/AudioParameter.h rename to android-headers/14/frameworks/base/include/media/AudioParameter.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/media/AudioRecord.h b/android-headers/14/frameworks/base/include/media/AudioRecord.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/media/AudioRecord.h rename to android-headers/14/frameworks/base/include/media/AudioRecord.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/media/AudioSystem.h b/android-headers/14/frameworks/base/include/media/AudioSystem.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/media/AudioSystem.h rename to android-headers/14/frameworks/base/include/media/AudioSystem.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/media/AudioTrack.h b/android-headers/14/frameworks/base/include/media/AudioTrack.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/media/AudioTrack.h rename to android-headers/14/frameworks/base/include/media/AudioTrack.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/media/EffectsFactoryApi.h b/android-headers/14/frameworks/base/include/media/EffectsFactoryApi.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/media/EffectsFactoryApi.h rename to android-headers/14/frameworks/base/include/media/EffectsFactoryApi.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/media/IAudioFlinger.h b/android-headers/14/frameworks/base/include/media/IAudioFlinger.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/media/IAudioFlinger.h rename to android-headers/14/frameworks/base/include/media/IAudioFlinger.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/media/IAudioFlingerClient.h b/android-headers/14/frameworks/base/include/media/IAudioFlingerClient.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/media/IAudioFlingerClient.h rename to android-headers/14/frameworks/base/include/media/IAudioFlingerClient.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/media/IAudioPolicyService.h b/android-headers/14/frameworks/base/include/media/IAudioPolicyService.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/media/IAudioPolicyService.h rename to android-headers/14/frameworks/base/include/media/IAudioPolicyService.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/media/IAudioRecord.h b/android-headers/14/frameworks/base/include/media/IAudioRecord.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/media/IAudioRecord.h rename to android-headers/14/frameworks/base/include/media/IAudioRecord.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/media/IAudioTrack.h b/android-headers/14/frameworks/base/include/media/IAudioTrack.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/media/IAudioTrack.h rename to android-headers/14/frameworks/base/include/media/IAudioTrack.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/media/IEffect.h b/android-headers/14/frameworks/base/include/media/IEffect.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/media/IEffect.h rename to android-headers/14/frameworks/base/include/media/IEffect.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/media/IEffectClient.h b/android-headers/14/frameworks/base/include/media/IEffectClient.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/media/IEffectClient.h rename to android-headers/14/frameworks/base/include/media/IEffectClient.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/media/IMediaDeathNotifier.h b/android-headers/14/frameworks/base/include/media/IMediaDeathNotifier.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/media/IMediaDeathNotifier.h rename to android-headers/14/frameworks/base/include/media/IMediaDeathNotifier.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/media/IMediaMetadataRetriever.h b/android-headers/14/frameworks/base/include/media/IMediaMetadataRetriever.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/media/IMediaMetadataRetriever.h rename to android-headers/14/frameworks/base/include/media/IMediaMetadataRetriever.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/media/IMediaPlayer.h b/android-headers/14/frameworks/base/include/media/IMediaPlayer.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/media/IMediaPlayer.h rename to android-headers/14/frameworks/base/include/media/IMediaPlayer.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/media/IMediaPlayerClient.h b/android-headers/14/frameworks/base/include/media/IMediaPlayerClient.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/media/IMediaPlayerClient.h rename to android-headers/14/frameworks/base/include/media/IMediaPlayerClient.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/media/IMediaPlayerService.h b/android-headers/14/frameworks/base/include/media/IMediaPlayerService.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/media/IMediaPlayerService.h rename to android-headers/14/frameworks/base/include/media/IMediaPlayerService.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/media/IMediaRecorder.h b/android-headers/14/frameworks/base/include/media/IMediaRecorder.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/media/IMediaRecorder.h rename to android-headers/14/frameworks/base/include/media/IMediaRecorder.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/media/IMediaRecorderClient.h b/android-headers/14/frameworks/base/include/media/IMediaRecorderClient.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/media/IMediaRecorderClient.h rename to android-headers/14/frameworks/base/include/media/IMediaRecorderClient.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/media/IOMX.h b/android-headers/14/frameworks/base/include/media/IOMX.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/media/IOMX.h rename to android-headers/14/frameworks/base/include/media/IOMX.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/media/IStreamSource.h b/android-headers/14/frameworks/base/include/media/IStreamSource.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/media/IStreamSource.h rename to android-headers/14/frameworks/base/include/media/IStreamSource.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/media/JetPlayer.h b/android-headers/14/frameworks/base/include/media/JetPlayer.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/media/JetPlayer.h rename to android-headers/14/frameworks/base/include/media/JetPlayer.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/media/MediaMetadataRetrieverInterface.h b/android-headers/14/frameworks/base/include/media/MediaMetadataRetrieverInterface.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/media/MediaMetadataRetrieverInterface.h rename to android-headers/14/frameworks/base/include/media/MediaMetadataRetrieverInterface.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/media/MediaPlayerInterface.h b/android-headers/14/frameworks/base/include/media/MediaPlayerInterface.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/media/MediaPlayerInterface.h rename to android-headers/14/frameworks/base/include/media/MediaPlayerInterface.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/media/MediaProfiles.h b/android-headers/14/frameworks/base/include/media/MediaProfiles.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/media/MediaProfiles.h rename to android-headers/14/frameworks/base/include/media/MediaProfiles.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/media/MediaRecorderBase.h b/android-headers/14/frameworks/base/include/media/MediaRecorderBase.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/media/MediaRecorderBase.h rename to android-headers/14/frameworks/base/include/media/MediaRecorderBase.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/media/MemoryLeakTrackUtil.h b/android-headers/14/frameworks/base/include/media/MemoryLeakTrackUtil.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/media/MemoryLeakTrackUtil.h rename to android-headers/14/frameworks/base/include/media/MemoryLeakTrackUtil.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/media/Metadata.h b/android-headers/14/frameworks/base/include/media/Metadata.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/media/Metadata.h rename to android-headers/14/frameworks/base/include/media/Metadata.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/media/ToneGenerator.h b/android-headers/14/frameworks/base/include/media/ToneGenerator.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/media/ToneGenerator.h rename to android-headers/14/frameworks/base/include/media/ToneGenerator.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/media/Visualizer.h b/android-headers/14/frameworks/base/include/media/Visualizer.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/media/Visualizer.h rename to android-headers/14/frameworks/base/include/media/Visualizer.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/media/mediametadataretriever.h b/android-headers/14/frameworks/base/include/media/mediametadataretriever.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/media/mediametadataretriever.h rename to android-headers/14/frameworks/base/include/media/mediametadataretriever.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/media/mediaplayer.h b/android-headers/14/frameworks/base/include/media/mediaplayer.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/media/mediaplayer.h rename to android-headers/14/frameworks/base/include/media/mediaplayer.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/media/mediarecorder.h b/android-headers/14/frameworks/base/include/media/mediarecorder.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/media/mediarecorder.h rename to android-headers/14/frameworks/base/include/media/mediarecorder.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/media/mediascanner.h b/android-headers/14/frameworks/base/include/media/mediascanner.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/media/mediascanner.h rename to android-headers/14/frameworks/base/include/media/mediascanner.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/media/stagefright/AACWriter.h b/android-headers/14/frameworks/base/include/media/stagefright/AACWriter.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/media/stagefright/AACWriter.h rename to android-headers/14/frameworks/base/include/media/stagefright/AACWriter.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/media/stagefright/ACodec.h b/android-headers/14/frameworks/base/include/media/stagefright/ACodec.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/media/stagefright/ACodec.h rename to android-headers/14/frameworks/base/include/media/stagefright/ACodec.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/media/stagefright/AMRWriter.h b/android-headers/14/frameworks/base/include/media/stagefright/AMRWriter.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/media/stagefright/AMRWriter.h rename to android-headers/14/frameworks/base/include/media/stagefright/AMRWriter.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/media/stagefright/AudioPlayer.h b/android-headers/14/frameworks/base/include/media/stagefright/AudioPlayer.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/media/stagefright/AudioPlayer.h rename to android-headers/14/frameworks/base/include/media/stagefright/AudioPlayer.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/media/stagefright/AudioSource.h b/android-headers/14/frameworks/base/include/media/stagefright/AudioSource.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/media/stagefright/AudioSource.h rename to android-headers/14/frameworks/base/include/media/stagefright/AudioSource.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/media/stagefright/CameraSource.h b/android-headers/14/frameworks/base/include/media/stagefright/CameraSource.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/media/stagefright/CameraSource.h rename to android-headers/14/frameworks/base/include/media/stagefright/CameraSource.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/media/stagefright/CameraSourceTimeLapse.h b/android-headers/14/frameworks/base/include/media/stagefright/CameraSourceTimeLapse.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/media/stagefright/CameraSourceTimeLapse.h rename to android-headers/14/frameworks/base/include/media/stagefright/CameraSourceTimeLapse.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/media/stagefright/ColorConverter.h b/android-headers/14/frameworks/base/include/media/stagefright/ColorConverter.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/media/stagefright/ColorConverter.h rename to android-headers/14/frameworks/base/include/media/stagefright/ColorConverter.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/media/stagefright/DataSource.h b/android-headers/14/frameworks/base/include/media/stagefright/DataSource.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/media/stagefright/DataSource.h rename to android-headers/14/frameworks/base/include/media/stagefright/DataSource.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/media/stagefright/FileSource.h b/android-headers/14/frameworks/base/include/media/stagefright/FileSource.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/media/stagefright/FileSource.h rename to android-headers/14/frameworks/base/include/media/stagefright/FileSource.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/media/stagefright/HardwareAPI.h b/android-headers/14/frameworks/base/include/media/stagefright/HardwareAPI.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/media/stagefright/HardwareAPI.h rename to android-headers/14/frameworks/base/include/media/stagefright/HardwareAPI.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/media/stagefright/JPEGSource.h b/android-headers/14/frameworks/base/include/media/stagefright/JPEGSource.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/media/stagefright/JPEGSource.h rename to android-headers/14/frameworks/base/include/media/stagefright/JPEGSource.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/media/stagefright/MPEG2TSWriter.h b/android-headers/14/frameworks/base/include/media/stagefright/MPEG2TSWriter.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/media/stagefright/MPEG2TSWriter.h rename to android-headers/14/frameworks/base/include/media/stagefright/MPEG2TSWriter.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/media/stagefright/MPEG4Writer.h b/android-headers/14/frameworks/base/include/media/stagefright/MPEG4Writer.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/media/stagefright/MPEG4Writer.h rename to android-headers/14/frameworks/base/include/media/stagefright/MPEG4Writer.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/media/stagefright/MediaBuffer.h b/android-headers/14/frameworks/base/include/media/stagefright/MediaBuffer.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/media/stagefright/MediaBuffer.h rename to android-headers/14/frameworks/base/include/media/stagefright/MediaBuffer.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/media/stagefright/MediaBufferGroup.h b/android-headers/14/frameworks/base/include/media/stagefright/MediaBufferGroup.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/media/stagefright/MediaBufferGroup.h rename to android-headers/14/frameworks/base/include/media/stagefright/MediaBufferGroup.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/media/stagefright/MediaDebug.h b/android-headers/14/frameworks/base/include/media/stagefright/MediaDebug.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/media/stagefright/MediaDebug.h rename to android-headers/14/frameworks/base/include/media/stagefright/MediaDebug.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/media/stagefright/MediaDefs.h b/android-headers/14/frameworks/base/include/media/stagefright/MediaDefs.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/media/stagefright/MediaDefs.h rename to android-headers/14/frameworks/base/include/media/stagefright/MediaDefs.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/media/stagefright/MediaErrors.h b/android-headers/14/frameworks/base/include/media/stagefright/MediaErrors.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/media/stagefright/MediaErrors.h rename to android-headers/14/frameworks/base/include/media/stagefright/MediaErrors.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/media/stagefright/MediaExtractor.h b/android-headers/14/frameworks/base/include/media/stagefright/MediaExtractor.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/media/stagefright/MediaExtractor.h rename to android-headers/14/frameworks/base/include/media/stagefright/MediaExtractor.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/media/stagefright/MediaSource.h b/android-headers/14/frameworks/base/include/media/stagefright/MediaSource.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/media/stagefright/MediaSource.h rename to android-headers/14/frameworks/base/include/media/stagefright/MediaSource.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/media/stagefright/MediaSourceSplitter.h b/android-headers/14/frameworks/base/include/media/stagefright/MediaSourceSplitter.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/media/stagefright/MediaSourceSplitter.h rename to android-headers/14/frameworks/base/include/media/stagefright/MediaSourceSplitter.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/media/stagefright/MediaWriter.h b/android-headers/14/frameworks/base/include/media/stagefright/MediaWriter.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/media/stagefright/MediaWriter.h rename to android-headers/14/frameworks/base/include/media/stagefright/MediaWriter.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/media/stagefright/MetaData.h b/android-headers/14/frameworks/base/include/media/stagefright/MetaData.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/media/stagefright/MetaData.h rename to android-headers/14/frameworks/base/include/media/stagefright/MetaData.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/media/stagefright/MetadataBufferType.h b/android-headers/14/frameworks/base/include/media/stagefright/MetadataBufferType.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/media/stagefright/MetadataBufferType.h rename to android-headers/14/frameworks/base/include/media/stagefright/MetadataBufferType.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/media/stagefright/NativeWindowWrapper.h b/android-headers/14/frameworks/base/include/media/stagefright/NativeWindowWrapper.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/media/stagefright/NativeWindowWrapper.h rename to android-headers/14/frameworks/base/include/media/stagefright/NativeWindowWrapper.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/media/stagefright/OMXClient.h b/android-headers/14/frameworks/base/include/media/stagefright/OMXClient.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/media/stagefright/OMXClient.h rename to android-headers/14/frameworks/base/include/media/stagefright/OMXClient.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/media/stagefright/OMXCodec.h b/android-headers/14/frameworks/base/include/media/stagefright/OMXCodec.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/media/stagefright/OMXCodec.h rename to android-headers/14/frameworks/base/include/media/stagefright/OMXCodec.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/media/stagefright/OMXPluginBase.h b/android-headers/14/frameworks/base/include/media/stagefright/OMXPluginBase.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/media/stagefright/OMXPluginBase.h rename to android-headers/14/frameworks/base/include/media/stagefright/OMXPluginBase.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/media/stagefright/StagefrightMediaScanner.h b/android-headers/14/frameworks/base/include/media/stagefright/StagefrightMediaScanner.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/media/stagefright/StagefrightMediaScanner.h rename to android-headers/14/frameworks/base/include/media/stagefright/StagefrightMediaScanner.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/media/stagefright/SurfaceMediaSource.h b/android-headers/14/frameworks/base/include/media/stagefright/SurfaceMediaSource.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/media/stagefright/SurfaceMediaSource.h rename to android-headers/14/frameworks/base/include/media/stagefright/SurfaceMediaSource.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/media/stagefright/TimeSource.h b/android-headers/14/frameworks/base/include/media/stagefright/TimeSource.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/media/stagefright/TimeSource.h rename to android-headers/14/frameworks/base/include/media/stagefright/TimeSource.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/media/stagefright/Utils.h b/android-headers/14/frameworks/base/include/media/stagefright/Utils.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/media/stagefright/Utils.h rename to android-headers/14/frameworks/base/include/media/stagefright/Utils.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/media/stagefright/VideoSourceDownSampler.h b/android-headers/14/frameworks/base/include/media/stagefright/VideoSourceDownSampler.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/media/stagefright/VideoSourceDownSampler.h rename to android-headers/14/frameworks/base/include/media/stagefright/VideoSourceDownSampler.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/media/stagefright/YUVCanvas.h b/android-headers/14/frameworks/base/include/media/stagefright/YUVCanvas.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/media/stagefright/YUVCanvas.h rename to android-headers/14/frameworks/base/include/media/stagefright/YUVCanvas.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/media/stagefright/YUVImage.h b/android-headers/14/frameworks/base/include/media/stagefright/YUVImage.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/media/stagefright/YUVImage.h rename to android-headers/14/frameworks/base/include/media/stagefright/YUVImage.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/media/stagefright/foundation/AAtomizer.h b/android-headers/14/frameworks/base/include/media/stagefright/foundation/AAtomizer.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/media/stagefright/foundation/AAtomizer.h rename to android-headers/14/frameworks/base/include/media/stagefright/foundation/AAtomizer.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/media/stagefright/foundation/ABase.h b/android-headers/14/frameworks/base/include/media/stagefright/foundation/ABase.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/media/stagefright/foundation/ABase.h rename to android-headers/14/frameworks/base/include/media/stagefright/foundation/ABase.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/media/stagefright/foundation/ABitReader.h b/android-headers/14/frameworks/base/include/media/stagefright/foundation/ABitReader.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/media/stagefright/foundation/ABitReader.h rename to android-headers/14/frameworks/base/include/media/stagefright/foundation/ABitReader.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/media/stagefright/foundation/ABuffer.h b/android-headers/14/frameworks/base/include/media/stagefright/foundation/ABuffer.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/media/stagefright/foundation/ABuffer.h rename to android-headers/14/frameworks/base/include/media/stagefright/foundation/ABuffer.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/media/stagefright/foundation/ADebug.h b/android-headers/14/frameworks/base/include/media/stagefright/foundation/ADebug.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/media/stagefright/foundation/ADebug.h rename to android-headers/14/frameworks/base/include/media/stagefright/foundation/ADebug.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/media/stagefright/foundation/AHandler.h b/android-headers/14/frameworks/base/include/media/stagefright/foundation/AHandler.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/media/stagefright/foundation/AHandler.h rename to android-headers/14/frameworks/base/include/media/stagefright/foundation/AHandler.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/media/stagefright/foundation/AHandlerReflector.h b/android-headers/14/frameworks/base/include/media/stagefright/foundation/AHandlerReflector.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/media/stagefright/foundation/AHandlerReflector.h rename to android-headers/14/frameworks/base/include/media/stagefright/foundation/AHandlerReflector.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/media/stagefright/foundation/AHierarchicalStateMachine.h b/android-headers/14/frameworks/base/include/media/stagefright/foundation/AHierarchicalStateMachine.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/media/stagefright/foundation/AHierarchicalStateMachine.h rename to android-headers/14/frameworks/base/include/media/stagefright/foundation/AHierarchicalStateMachine.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/media/stagefright/foundation/ALooper.h b/android-headers/14/frameworks/base/include/media/stagefright/foundation/ALooper.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/media/stagefright/foundation/ALooper.h rename to android-headers/14/frameworks/base/include/media/stagefright/foundation/ALooper.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/media/stagefright/foundation/ALooperRoster.h b/android-headers/14/frameworks/base/include/media/stagefright/foundation/ALooperRoster.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/media/stagefright/foundation/ALooperRoster.h rename to android-headers/14/frameworks/base/include/media/stagefright/foundation/ALooperRoster.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/media/stagefright/foundation/AMessage.h b/android-headers/14/frameworks/base/include/media/stagefright/foundation/AMessage.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/media/stagefright/foundation/AMessage.h rename to android-headers/14/frameworks/base/include/media/stagefright/foundation/AMessage.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/media/stagefright/foundation/AString.h b/android-headers/14/frameworks/base/include/media/stagefright/foundation/AString.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/media/stagefright/foundation/AString.h rename to android-headers/14/frameworks/base/include/media/stagefright/foundation/AString.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/media/stagefright/foundation/base64.h b/android-headers/14/frameworks/base/include/media/stagefright/foundation/base64.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/media/stagefright/foundation/base64.h rename to android-headers/14/frameworks/base/include/media/stagefright/foundation/base64.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/media/stagefright/foundation/hexdump.h b/android-headers/14/frameworks/base/include/media/stagefright/foundation/hexdump.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/media/stagefright/foundation/hexdump.h rename to android-headers/14/frameworks/base/include/media/stagefright/foundation/hexdump.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/media/stagefright/openmax/OMX_Audio.h b/android-headers/14/frameworks/base/include/media/stagefright/openmax/OMX_Audio.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/media/stagefright/openmax/OMX_Audio.h rename to android-headers/14/frameworks/base/include/media/stagefright/openmax/OMX_Audio.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/media/stagefright/openmax/OMX_Component.h b/android-headers/14/frameworks/base/include/media/stagefright/openmax/OMX_Component.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/media/stagefright/openmax/OMX_Component.h rename to android-headers/14/frameworks/base/include/media/stagefright/openmax/OMX_Component.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/media/stagefright/openmax/OMX_ContentPipe.h b/android-headers/14/frameworks/base/include/media/stagefright/openmax/OMX_ContentPipe.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/media/stagefright/openmax/OMX_ContentPipe.h rename to android-headers/14/frameworks/base/include/media/stagefright/openmax/OMX_ContentPipe.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/media/stagefright/openmax/OMX_Core.h b/android-headers/14/frameworks/base/include/media/stagefright/openmax/OMX_Core.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/media/stagefright/openmax/OMX_Core.h rename to android-headers/14/frameworks/base/include/media/stagefright/openmax/OMX_Core.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/media/stagefright/openmax/OMX_IVCommon.h b/android-headers/14/frameworks/base/include/media/stagefright/openmax/OMX_IVCommon.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/media/stagefright/openmax/OMX_IVCommon.h rename to android-headers/14/frameworks/base/include/media/stagefright/openmax/OMX_IVCommon.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/media/stagefright/openmax/OMX_Image.h b/android-headers/14/frameworks/base/include/media/stagefright/openmax/OMX_Image.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/media/stagefright/openmax/OMX_Image.h rename to android-headers/14/frameworks/base/include/media/stagefright/openmax/OMX_Image.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/media/stagefright/openmax/OMX_Index.h b/android-headers/14/frameworks/base/include/media/stagefright/openmax/OMX_Index.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/media/stagefright/openmax/OMX_Index.h rename to android-headers/14/frameworks/base/include/media/stagefright/openmax/OMX_Index.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/media/stagefright/openmax/OMX_Other.h b/android-headers/14/frameworks/base/include/media/stagefright/openmax/OMX_Other.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/media/stagefright/openmax/OMX_Other.h rename to android-headers/14/frameworks/base/include/media/stagefright/openmax/OMX_Other.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/media/stagefright/openmax/OMX_Types.h b/android-headers/14/frameworks/base/include/media/stagefright/openmax/OMX_Types.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/media/stagefright/openmax/OMX_Types.h rename to android-headers/14/frameworks/base/include/media/stagefright/openmax/OMX_Types.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/media/stagefright/openmax/OMX_Video.h b/android-headers/14/frameworks/base/include/media/stagefright/openmax/OMX_Video.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/media/stagefright/openmax/OMX_Video.h rename to android-headers/14/frameworks/base/include/media/stagefright/openmax/OMX_Video.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/media/thread_init.h b/android-headers/14/frameworks/base/include/media/thread_init.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/media/thread_init.h rename to android-headers/14/frameworks/base/include/media/thread_init.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/powermanager/IPowerManager.h b/android-headers/14/frameworks/base/include/powermanager/IPowerManager.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/powermanager/IPowerManager.h rename to android-headers/14/frameworks/base/include/powermanager/IPowerManager.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/powermanager/PowerManager.h b/android-headers/14/frameworks/base/include/powermanager/PowerManager.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/powermanager/PowerManager.h rename to android-headers/14/frameworks/base/include/powermanager/PowerManager.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/private/README b/android-headers/14/frameworks/base/include/private/README similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/private/README rename to android-headers/14/frameworks/base/include/private/README diff --git a/android-headers/android-headers-ics/frameworks/base/include/private/binder/Static.h b/android-headers/14/frameworks/base/include/private/binder/Static.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/private/binder/Static.h rename to android-headers/14/frameworks/base/include/private/binder/Static.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/private/binder/binder_module.h b/android-headers/14/frameworks/base/include/private/binder/binder_module.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/private/binder/binder_module.h rename to android-headers/14/frameworks/base/include/private/binder/binder_module.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/private/hwui/DrawGlInfo.h b/android-headers/14/frameworks/base/include/private/hwui/DrawGlInfo.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/private/hwui/DrawGlInfo.h rename to android-headers/14/frameworks/base/include/private/hwui/DrawGlInfo.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/private/media/AudioEffectShared.h b/android-headers/14/frameworks/base/include/private/media/AudioEffectShared.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/private/media/AudioEffectShared.h rename to android-headers/14/frameworks/base/include/private/media/AudioEffectShared.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/private/media/AudioTrackShared.h b/android-headers/14/frameworks/base/include/private/media/AudioTrackShared.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/private/media/AudioTrackShared.h rename to android-headers/14/frameworks/base/include/private/media/AudioTrackShared.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/private/media/VideoFrame.h b/android-headers/14/frameworks/base/include/private/media/VideoFrame.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/private/media/VideoFrame.h rename to android-headers/14/frameworks/base/include/private/media/VideoFrame.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/private/opengles/gl_context.h b/android-headers/14/frameworks/base/include/private/opengles/gl_context.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/private/opengles/gl_context.h rename to android-headers/14/frameworks/base/include/private/opengles/gl_context.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/private/surfaceflinger/LayerState.h b/android-headers/14/frameworks/base/include/private/surfaceflinger/LayerState.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/private/surfaceflinger/LayerState.h rename to android-headers/14/frameworks/base/include/private/surfaceflinger/LayerState.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/private/surfaceflinger/SharedBufferStack.h b/android-headers/14/frameworks/base/include/private/surfaceflinger/SharedBufferStack.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/private/surfaceflinger/SharedBufferStack.h rename to android-headers/14/frameworks/base/include/private/surfaceflinger/SharedBufferStack.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/private/ui/RegionHelper.h b/android-headers/14/frameworks/base/include/private/ui/RegionHelper.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/private/ui/RegionHelper.h rename to android-headers/14/frameworks/base/include/private/ui/RegionHelper.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/private/ui/android_natives_priv.h b/android-headers/14/frameworks/base/include/private/ui/android_natives_priv.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/private/ui/android_natives_priv.h rename to android-headers/14/frameworks/base/include/private/ui/android_natives_priv.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/private/utils/Static.h b/android-headers/14/frameworks/base/include/private/utils/Static.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/private/utils/Static.h rename to android-headers/14/frameworks/base/include/private/utils/Static.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/storage/IMountService.h b/android-headers/14/frameworks/base/include/storage/IMountService.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/storage/IMountService.h rename to android-headers/14/frameworks/base/include/storage/IMountService.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/storage/IMountServiceListener.h b/android-headers/14/frameworks/base/include/storage/IMountServiceListener.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/storage/IMountServiceListener.h rename to android-headers/14/frameworks/base/include/storage/IMountServiceListener.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/storage/IMountShutdownObserver.h b/android-headers/14/frameworks/base/include/storage/IMountShutdownObserver.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/storage/IMountShutdownObserver.h rename to android-headers/14/frameworks/base/include/storage/IMountShutdownObserver.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/storage/IObbActionListener.h b/android-headers/14/frameworks/base/include/storage/IObbActionListener.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/storage/IObbActionListener.h rename to android-headers/14/frameworks/base/include/storage/IObbActionListener.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/surfaceflinger/IGraphicBufferAlloc.h b/android-headers/14/frameworks/base/include/surfaceflinger/IGraphicBufferAlloc.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/surfaceflinger/IGraphicBufferAlloc.h rename to android-headers/14/frameworks/base/include/surfaceflinger/IGraphicBufferAlloc.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/surfaceflinger/ISurface.h b/android-headers/14/frameworks/base/include/surfaceflinger/ISurface.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/surfaceflinger/ISurface.h rename to android-headers/14/frameworks/base/include/surfaceflinger/ISurface.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/surfaceflinger/ISurfaceComposer.h b/android-headers/14/frameworks/base/include/surfaceflinger/ISurfaceComposer.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/surfaceflinger/ISurfaceComposer.h rename to android-headers/14/frameworks/base/include/surfaceflinger/ISurfaceComposer.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/surfaceflinger/ISurfaceComposerClient.h b/android-headers/14/frameworks/base/include/surfaceflinger/ISurfaceComposerClient.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/surfaceflinger/ISurfaceComposerClient.h rename to android-headers/14/frameworks/base/include/surfaceflinger/ISurfaceComposerClient.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/surfaceflinger/Surface.h b/android-headers/14/frameworks/base/include/surfaceflinger/Surface.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/surfaceflinger/Surface.h rename to android-headers/14/frameworks/base/include/surfaceflinger/Surface.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/surfaceflinger/SurfaceComposerClient.h b/android-headers/14/frameworks/base/include/surfaceflinger/SurfaceComposerClient.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/surfaceflinger/SurfaceComposerClient.h rename to android-headers/14/frameworks/base/include/surfaceflinger/SurfaceComposerClient.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/ui/DisplayInfo.h b/android-headers/14/frameworks/base/include/ui/DisplayInfo.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/ui/DisplayInfo.h rename to android-headers/14/frameworks/base/include/ui/DisplayInfo.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/ui/EGLNativeSurface.h b/android-headers/14/frameworks/base/include/ui/EGLNativeSurface.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/ui/EGLNativeSurface.h rename to android-headers/14/frameworks/base/include/ui/EGLNativeSurface.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/ui/EGLUtils.h b/android-headers/14/frameworks/base/include/ui/EGLUtils.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/ui/EGLUtils.h rename to android-headers/14/frameworks/base/include/ui/EGLUtils.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/ui/FramebufferNativeWindow.h b/android-headers/14/frameworks/base/include/ui/FramebufferNativeWindow.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/ui/FramebufferNativeWindow.h rename to android-headers/14/frameworks/base/include/ui/FramebufferNativeWindow.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/ui/GraphicBuffer.h b/android-headers/14/frameworks/base/include/ui/GraphicBuffer.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/ui/GraphicBuffer.h rename to android-headers/14/frameworks/base/include/ui/GraphicBuffer.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/ui/GraphicBufferAllocator.h b/android-headers/14/frameworks/base/include/ui/GraphicBufferAllocator.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/ui/GraphicBufferAllocator.h rename to android-headers/14/frameworks/base/include/ui/GraphicBufferAllocator.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/ui/GraphicBufferMapper.h b/android-headers/14/frameworks/base/include/ui/GraphicBufferMapper.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/ui/GraphicBufferMapper.h rename to android-headers/14/frameworks/base/include/ui/GraphicBufferMapper.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/ui/GraphicLog.h b/android-headers/14/frameworks/base/include/ui/GraphicLog.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/ui/GraphicLog.h rename to android-headers/14/frameworks/base/include/ui/GraphicLog.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/ui/Input.h b/android-headers/14/frameworks/base/include/ui/Input.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/ui/Input.h rename to android-headers/14/frameworks/base/include/ui/Input.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/ui/InputTransport.h b/android-headers/14/frameworks/base/include/ui/InputTransport.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/ui/InputTransport.h rename to android-headers/14/frameworks/base/include/ui/InputTransport.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/ui/KeyCharacterMap.h b/android-headers/14/frameworks/base/include/ui/KeyCharacterMap.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/ui/KeyCharacterMap.h rename to android-headers/14/frameworks/base/include/ui/KeyCharacterMap.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/ui/KeyLayoutMap.h b/android-headers/14/frameworks/base/include/ui/KeyLayoutMap.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/ui/KeyLayoutMap.h rename to android-headers/14/frameworks/base/include/ui/KeyLayoutMap.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/ui/Keyboard.h b/android-headers/14/frameworks/base/include/ui/Keyboard.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/ui/Keyboard.h rename to android-headers/14/frameworks/base/include/ui/Keyboard.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/ui/KeycodeLabels.h b/android-headers/14/frameworks/base/include/ui/KeycodeLabels.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/ui/KeycodeLabels.h rename to android-headers/14/frameworks/base/include/ui/KeycodeLabels.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/ui/PixelFormat.h b/android-headers/14/frameworks/base/include/ui/PixelFormat.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/ui/PixelFormat.h rename to android-headers/14/frameworks/base/include/ui/PixelFormat.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/ui/Point.h b/android-headers/14/frameworks/base/include/ui/Point.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/ui/Point.h rename to android-headers/14/frameworks/base/include/ui/Point.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/ui/PowerManager.h b/android-headers/14/frameworks/base/include/ui/PowerManager.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/ui/PowerManager.h rename to android-headers/14/frameworks/base/include/ui/PowerManager.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/ui/Rect.h b/android-headers/14/frameworks/base/include/ui/Rect.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/ui/Rect.h rename to android-headers/14/frameworks/base/include/ui/Rect.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/ui/Region.h b/android-headers/14/frameworks/base/include/ui/Region.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/ui/Region.h rename to android-headers/14/frameworks/base/include/ui/Region.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/ui/VirtualKeyMap.h b/android-headers/14/frameworks/base/include/ui/VirtualKeyMap.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/ui/VirtualKeyMap.h rename to android-headers/14/frameworks/base/include/ui/VirtualKeyMap.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/ui/android_native_buffer.h b/android-headers/14/frameworks/base/include/ui/android_native_buffer.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/ui/android_native_buffer.h rename to android-headers/14/frameworks/base/include/ui/android_native_buffer.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/ui/egl/android_natives.h b/android-headers/14/frameworks/base/include/ui/egl/android_natives.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/ui/egl/android_natives.h rename to android-headers/14/frameworks/base/include/ui/egl/android_natives.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/utils/Asset.h b/android-headers/14/frameworks/base/include/utils/Asset.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/utils/Asset.h rename to android-headers/14/frameworks/base/include/utils/Asset.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/utils/AssetDir.h b/android-headers/14/frameworks/base/include/utils/AssetDir.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/utils/AssetDir.h rename to android-headers/14/frameworks/base/include/utils/AssetDir.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/utils/AssetManager.h b/android-headers/14/frameworks/base/include/utils/AssetManager.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/utils/AssetManager.h rename to android-headers/14/frameworks/base/include/utils/AssetManager.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/utils/Atomic.h b/android-headers/14/frameworks/base/include/utils/Atomic.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/utils/Atomic.h rename to android-headers/14/frameworks/base/include/utils/Atomic.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/utils/BackupHelpers.h b/android-headers/14/frameworks/base/include/utils/BackupHelpers.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/utils/BackupHelpers.h rename to android-headers/14/frameworks/base/include/utils/BackupHelpers.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/utils/BitSet.h b/android-headers/14/frameworks/base/include/utils/BitSet.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/utils/BitSet.h rename to android-headers/14/frameworks/base/include/utils/BitSet.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/utils/BlobCache.h b/android-headers/14/frameworks/base/include/utils/BlobCache.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/utils/BlobCache.h rename to android-headers/14/frameworks/base/include/utils/BlobCache.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/utils/BufferedTextOutput.h b/android-headers/14/frameworks/base/include/utils/BufferedTextOutput.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/utils/BufferedTextOutput.h rename to android-headers/14/frameworks/base/include/utils/BufferedTextOutput.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/utils/ByteOrder.h b/android-headers/14/frameworks/base/include/utils/ByteOrder.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/utils/ByteOrder.h rename to android-headers/14/frameworks/base/include/utils/ByteOrder.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/utils/CallStack.h b/android-headers/14/frameworks/base/include/utils/CallStack.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/utils/CallStack.h rename to android-headers/14/frameworks/base/include/utils/CallStack.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/utils/Compat.h b/android-headers/14/frameworks/base/include/utils/Compat.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/utils/Compat.h rename to android-headers/14/frameworks/base/include/utils/Compat.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/utils/Debug.h b/android-headers/14/frameworks/base/include/utils/Debug.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/utils/Debug.h rename to android-headers/14/frameworks/base/include/utils/Debug.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/utils/Endian.h b/android-headers/14/frameworks/base/include/utils/Endian.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/utils/Endian.h rename to android-headers/14/frameworks/base/include/utils/Endian.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/utils/Errors.h b/android-headers/14/frameworks/base/include/utils/Errors.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/utils/Errors.h rename to android-headers/14/frameworks/base/include/utils/Errors.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/utils/FileMap.h b/android-headers/14/frameworks/base/include/utils/FileMap.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/utils/FileMap.h rename to android-headers/14/frameworks/base/include/utils/FileMap.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/utils/Flattenable.h b/android-headers/14/frameworks/base/include/utils/Flattenable.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/utils/Flattenable.h rename to android-headers/14/frameworks/base/include/utils/Flattenable.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/utils/Functor.h b/android-headers/14/frameworks/base/include/utils/Functor.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/utils/Functor.h rename to android-headers/14/frameworks/base/include/utils/Functor.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/utils/GenerationCache.h b/android-headers/14/frameworks/base/include/utils/GenerationCache.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/utils/GenerationCache.h rename to android-headers/14/frameworks/base/include/utils/GenerationCache.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/utils/KeyedVector.h b/android-headers/14/frameworks/base/include/utils/KeyedVector.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/utils/KeyedVector.h rename to android-headers/14/frameworks/base/include/utils/KeyedVector.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/utils/LinearTransform.h b/android-headers/14/frameworks/base/include/utils/LinearTransform.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/utils/LinearTransform.h rename to android-headers/14/frameworks/base/include/utils/LinearTransform.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/utils/List.h b/android-headers/14/frameworks/base/include/utils/List.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/utils/List.h rename to android-headers/14/frameworks/base/include/utils/List.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/utils/Log.h b/android-headers/14/frameworks/base/include/utils/Log.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/utils/Log.h rename to android-headers/14/frameworks/base/include/utils/Log.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/utils/Looper.h b/android-headers/14/frameworks/base/include/utils/Looper.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/utils/Looper.h rename to android-headers/14/frameworks/base/include/utils/Looper.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/utils/ObbFile.h b/android-headers/14/frameworks/base/include/utils/ObbFile.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/utils/ObbFile.h rename to android-headers/14/frameworks/base/include/utils/ObbFile.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/utils/PropertyMap.h b/android-headers/14/frameworks/base/include/utils/PropertyMap.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/utils/PropertyMap.h rename to android-headers/14/frameworks/base/include/utils/PropertyMap.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/utils/RefBase.h b/android-headers/14/frameworks/base/include/utils/RefBase.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/utils/RefBase.h rename to android-headers/14/frameworks/base/include/utils/RefBase.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/utils/ResourceTypes.h b/android-headers/14/frameworks/base/include/utils/ResourceTypes.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/utils/ResourceTypes.h rename to android-headers/14/frameworks/base/include/utils/ResourceTypes.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/utils/SharedBuffer.h b/android-headers/14/frameworks/base/include/utils/SharedBuffer.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/utils/SharedBuffer.h rename to android-headers/14/frameworks/base/include/utils/SharedBuffer.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/utils/Singleton.h b/android-headers/14/frameworks/base/include/utils/Singleton.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/utils/Singleton.h rename to android-headers/14/frameworks/base/include/utils/Singleton.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/utils/SortedVector.h b/android-headers/14/frameworks/base/include/utils/SortedVector.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/utils/SortedVector.h rename to android-headers/14/frameworks/base/include/utils/SortedVector.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/utils/StopWatch.h b/android-headers/14/frameworks/base/include/utils/StopWatch.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/utils/StopWatch.h rename to android-headers/14/frameworks/base/include/utils/StopWatch.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/utils/StreamingZipInflater.h b/android-headers/14/frameworks/base/include/utils/StreamingZipInflater.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/utils/StreamingZipInflater.h rename to android-headers/14/frameworks/base/include/utils/StreamingZipInflater.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/utils/String16.h b/android-headers/14/frameworks/base/include/utils/String16.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/utils/String16.h rename to android-headers/14/frameworks/base/include/utils/String16.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/utils/String8.h b/android-headers/14/frameworks/base/include/utils/String8.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/utils/String8.h rename to android-headers/14/frameworks/base/include/utils/String8.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/utils/StringArray.h b/android-headers/14/frameworks/base/include/utils/StringArray.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/utils/StringArray.h rename to android-headers/14/frameworks/base/include/utils/StringArray.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/utils/StrongPointer.h b/android-headers/14/frameworks/base/include/utils/StrongPointer.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/utils/StrongPointer.h rename to android-headers/14/frameworks/base/include/utils/StrongPointer.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/utils/SystemClock.h b/android-headers/14/frameworks/base/include/utils/SystemClock.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/utils/SystemClock.h rename to android-headers/14/frameworks/base/include/utils/SystemClock.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/utils/TextOutput.h b/android-headers/14/frameworks/base/include/utils/TextOutput.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/utils/TextOutput.h rename to android-headers/14/frameworks/base/include/utils/TextOutput.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/utils/Timers.h b/android-headers/14/frameworks/base/include/utils/Timers.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/utils/Timers.h rename to android-headers/14/frameworks/base/include/utils/Timers.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/utils/Tokenizer.h b/android-headers/14/frameworks/base/include/utils/Tokenizer.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/utils/Tokenizer.h rename to android-headers/14/frameworks/base/include/utils/Tokenizer.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/utils/TypeHelpers.h b/android-headers/14/frameworks/base/include/utils/TypeHelpers.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/utils/TypeHelpers.h rename to android-headers/14/frameworks/base/include/utils/TypeHelpers.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/utils/Unicode.h b/android-headers/14/frameworks/base/include/utils/Unicode.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/utils/Unicode.h rename to android-headers/14/frameworks/base/include/utils/Unicode.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/utils/Vector.h b/android-headers/14/frameworks/base/include/utils/Vector.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/utils/Vector.h rename to android-headers/14/frameworks/base/include/utils/Vector.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/utils/VectorImpl.h b/android-headers/14/frameworks/base/include/utils/VectorImpl.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/utils/VectorImpl.h rename to android-headers/14/frameworks/base/include/utils/VectorImpl.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/utils/ZipFileCRO.h b/android-headers/14/frameworks/base/include/utils/ZipFileCRO.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/utils/ZipFileCRO.h rename to android-headers/14/frameworks/base/include/utils/ZipFileCRO.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/utils/ZipFileRO.h b/android-headers/14/frameworks/base/include/utils/ZipFileRO.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/utils/ZipFileRO.h rename to android-headers/14/frameworks/base/include/utils/ZipFileRO.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/utils/ZipUtils.h b/android-headers/14/frameworks/base/include/utils/ZipUtils.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/utils/ZipUtils.h rename to android-headers/14/frameworks/base/include/utils/ZipUtils.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/utils/ashmem.h b/android-headers/14/frameworks/base/include/utils/ashmem.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/utils/ashmem.h rename to android-headers/14/frameworks/base/include/utils/ashmem.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/utils/misc.h b/android-headers/14/frameworks/base/include/utils/misc.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/utils/misc.h rename to android-headers/14/frameworks/base/include/utils/misc.h diff --git a/android-headers/android-headers-ics/frameworks/base/include/utils/threads.h b/android-headers/14/frameworks/base/include/utils/threads.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/include/utils/threads.h rename to android-headers/14/frameworks/base/include/utils/threads.h diff --git a/android-headers/android-headers-ics/frameworks/base/native/include/android/asset_manager.h b/android-headers/14/frameworks/base/native/include/android/asset_manager.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/native/include/android/asset_manager.h rename to android-headers/14/frameworks/base/native/include/android/asset_manager.h diff --git a/android-headers/android-headers-ics/frameworks/base/native/include/android/asset_manager_jni.h b/android-headers/14/frameworks/base/native/include/android/asset_manager_jni.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/native/include/android/asset_manager_jni.h rename to android-headers/14/frameworks/base/native/include/android/asset_manager_jni.h diff --git a/android-headers/android-headers-ics/frameworks/base/native/include/android/bitmap.h b/android-headers/14/frameworks/base/native/include/android/bitmap.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/native/include/android/bitmap.h rename to android-headers/14/frameworks/base/native/include/android/bitmap.h diff --git a/android-headers/android-headers-ics/frameworks/base/native/include/android/configuration.h b/android-headers/14/frameworks/base/native/include/android/configuration.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/native/include/android/configuration.h rename to android-headers/14/frameworks/base/native/include/android/configuration.h diff --git a/android-headers/android-headers-ics/frameworks/base/native/include/android/input.h b/android-headers/14/frameworks/base/native/include/android/input.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/native/include/android/input.h rename to android-headers/14/frameworks/base/native/include/android/input.h diff --git a/android-headers/android-headers-ics/frameworks/base/native/include/android/keycodes.h b/android-headers/14/frameworks/base/native/include/android/keycodes.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/native/include/android/keycodes.h rename to android-headers/14/frameworks/base/native/include/android/keycodes.h diff --git a/android-headers/android-headers-ics/frameworks/base/native/include/android/looper.h b/android-headers/14/frameworks/base/native/include/android/looper.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/native/include/android/looper.h rename to android-headers/14/frameworks/base/native/include/android/looper.h diff --git a/android-headers/android-headers-ics/frameworks/base/native/include/android/native_activity.h b/android-headers/14/frameworks/base/native/include/android/native_activity.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/native/include/android/native_activity.h rename to android-headers/14/frameworks/base/native/include/android/native_activity.h diff --git a/android-headers/android-headers-ics/frameworks/base/native/include/android/native_window.h b/android-headers/14/frameworks/base/native/include/android/native_window.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/native/include/android/native_window.h rename to android-headers/14/frameworks/base/native/include/android/native_window.h diff --git a/android-headers/android-headers-ics/frameworks/base/native/include/android/native_window_jni.h b/android-headers/14/frameworks/base/native/include/android/native_window_jni.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/native/include/android/native_window_jni.h rename to android-headers/14/frameworks/base/native/include/android/native_window_jni.h diff --git a/android-headers/android-headers-ics/frameworks/base/native/include/android/obb.h b/android-headers/14/frameworks/base/native/include/android/obb.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/native/include/android/obb.h rename to android-headers/14/frameworks/base/native/include/android/obb.h diff --git a/android-headers/android-headers-ics/frameworks/base/native/include/android/rect.h b/android-headers/14/frameworks/base/native/include/android/rect.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/native/include/android/rect.h rename to android-headers/14/frameworks/base/native/include/android/rect.h diff --git a/android-headers/android-headers-ics/frameworks/base/native/include/android/sensor.h b/android-headers/14/frameworks/base/native/include/android/sensor.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/native/include/android/sensor.h rename to android-headers/14/frameworks/base/native/include/android/sensor.h diff --git a/android-headers/android-headers-ics/frameworks/base/native/include/android/storage_manager.h b/android-headers/14/frameworks/base/native/include/android/storage_manager.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/native/include/android/storage_manager.h rename to android-headers/14/frameworks/base/native/include/android/storage_manager.h diff --git a/android-headers/android-headers-ics/frameworks/base/native/include/android/window.h b/android-headers/14/frameworks/base/native/include/android/window.h similarity index 100% rename from android-headers/android-headers-ics/frameworks/base/native/include/android/window.h rename to android-headers/14/frameworks/base/native/include/android/window.h diff --git a/android-headers/android-headers-ics/hardware/libhardware/include/hardware/audio.h b/android-headers/14/hardware/libhardware/include/hardware/audio.h similarity index 100% rename from android-headers/android-headers-ics/hardware/libhardware/include/hardware/audio.h rename to android-headers/14/hardware/libhardware/include/hardware/audio.h diff --git a/android-headers/android-headers-ics/hardware/libhardware/include/hardware/audio_effect.h b/android-headers/14/hardware/libhardware/include/hardware/audio_effect.h similarity index 100% rename from android-headers/android-headers-ics/hardware/libhardware/include/hardware/audio_effect.h rename to android-headers/14/hardware/libhardware/include/hardware/audio_effect.h diff --git a/android-headers/android-headers-ics/hardware/libhardware/include/hardware/audio_policy.h b/android-headers/14/hardware/libhardware/include/hardware/audio_policy.h similarity index 100% rename from android-headers/android-headers-ics/hardware/libhardware/include/hardware/audio_policy.h rename to android-headers/14/hardware/libhardware/include/hardware/audio_policy.h diff --git a/android-headers/android-headers-ics/hardware/libhardware/include/hardware/camera.h b/android-headers/14/hardware/libhardware/include/hardware/camera.h similarity index 100% rename from android-headers/android-headers-ics/hardware/libhardware/include/hardware/camera.h rename to android-headers/14/hardware/libhardware/include/hardware/camera.h diff --git a/android-headers/android-headers-ics/hardware/libhardware/include/hardware/fb.h b/android-headers/14/hardware/libhardware/include/hardware/fb.h similarity index 100% rename from android-headers/android-headers-ics/hardware/libhardware/include/hardware/fb.h rename to android-headers/14/hardware/libhardware/include/hardware/fb.h diff --git a/android-headers/android-headers-ics/hardware/libhardware/include/hardware/gps.h b/android-headers/14/hardware/libhardware/include/hardware/gps.h similarity index 100% rename from android-headers/android-headers-ics/hardware/libhardware/include/hardware/gps.h rename to android-headers/14/hardware/libhardware/include/hardware/gps.h diff --git a/android-headers/android-headers-ics/hardware/libhardware/include/hardware/gralloc.h b/android-headers/14/hardware/libhardware/include/hardware/gralloc.h similarity index 100% rename from android-headers/android-headers-ics/hardware/libhardware/include/hardware/gralloc.h rename to android-headers/14/hardware/libhardware/include/hardware/gralloc.h diff --git a/android-headers/android-headers-ics/hardware/libhardware/include/hardware/hardware.h b/android-headers/14/hardware/libhardware/include/hardware/hardware.h similarity index 100% rename from android-headers/android-headers-ics/hardware/libhardware/include/hardware/hardware.h rename to android-headers/14/hardware/libhardware/include/hardware/hardware.h diff --git a/android-headers/android-headers-ics/hardware/libhardware/include/hardware/hwcomposer.h b/android-headers/14/hardware/libhardware/include/hardware/hwcomposer.h similarity index 100% rename from android-headers/android-headers-ics/hardware/libhardware/include/hardware/hwcomposer.h rename to android-headers/14/hardware/libhardware/include/hardware/hwcomposer.h diff --git a/android-headers/android-headers-ics/hardware/libhardware/include/hardware/lights.h b/android-headers/14/hardware/libhardware/include/hardware/lights.h similarity index 100% rename from android-headers/android-headers-ics/hardware/libhardware/include/hardware/lights.h rename to android-headers/14/hardware/libhardware/include/hardware/lights.h diff --git a/android-headers/android-headers-ics/hardware/libhardware/include/hardware/nfc.h b/android-headers/14/hardware/libhardware/include/hardware/nfc.h similarity index 100% rename from android-headers/android-headers-ics/hardware/libhardware/include/hardware/nfc.h rename to android-headers/14/hardware/libhardware/include/hardware/nfc.h diff --git a/android-headers/android-headers-ics/hardware/libhardware/include/hardware/qemu_pipe.h b/android-headers/14/hardware/libhardware/include/hardware/qemu_pipe.h similarity index 100% rename from android-headers/android-headers-ics/hardware/libhardware/include/hardware/qemu_pipe.h rename to android-headers/14/hardware/libhardware/include/hardware/qemu_pipe.h diff --git a/android-headers/android-headers-ics/hardware/libhardware/include/hardware/qemud.h b/android-headers/14/hardware/libhardware/include/hardware/qemud.h similarity index 100% rename from android-headers/android-headers-ics/hardware/libhardware/include/hardware/qemud.h rename to android-headers/14/hardware/libhardware/include/hardware/qemud.h diff --git a/android-headers/android-headers-ics/hardware/libhardware/include/hardware/sensors.h b/android-headers/14/hardware/libhardware/include/hardware/sensors.h similarity index 100% rename from android-headers/android-headers-ics/hardware/libhardware/include/hardware/sensors.h rename to android-headers/14/hardware/libhardware/include/hardware/sensors.h diff --git a/android-headers/android-headers-ics/system/core/include/android/log.h b/android-headers/14/system/core/include/android/log.h similarity index 100% rename from android-headers/android-headers-ics/system/core/include/android/log.h rename to android-headers/14/system/core/include/android/log.h diff --git a/android-headers/android-headers-ics/system/core/include/arch/darwin-x86/AndroidConfig.h b/android-headers/14/system/core/include/arch/darwin-x86/AndroidConfig.h similarity index 100% rename from android-headers/android-headers-ics/system/core/include/arch/darwin-x86/AndroidConfig.h rename to android-headers/14/system/core/include/arch/darwin-x86/AndroidConfig.h diff --git a/android-headers/android-headers-ics/system/core/include/arch/freebsd-x86/AndroidConfig.h b/android-headers/14/system/core/include/arch/freebsd-x86/AndroidConfig.h similarity index 100% rename from android-headers/android-headers-ics/system/core/include/arch/freebsd-x86/AndroidConfig.h rename to android-headers/14/system/core/include/arch/freebsd-x86/AndroidConfig.h diff --git a/android-headers/android-headers-ics/system/core/include/arch/linux-arm/AndroidConfig.h b/android-headers/14/system/core/include/arch/linux-arm/AndroidConfig.h similarity index 100% rename from android-headers/android-headers-ics/system/core/include/arch/linux-arm/AndroidConfig.h rename to android-headers/14/system/core/include/arch/linux-arm/AndroidConfig.h diff --git a/android-headers/android-headers-ics/system/core/include/arch/linux-ppc/AndroidConfig.h b/android-headers/14/system/core/include/arch/linux-ppc/AndroidConfig.h similarity index 100% rename from android-headers/android-headers-ics/system/core/include/arch/linux-ppc/AndroidConfig.h rename to android-headers/14/system/core/include/arch/linux-ppc/AndroidConfig.h diff --git a/android-headers/android-headers-ics/system/core/include/arch/linux-sh/AndroidConfig.h b/android-headers/14/system/core/include/arch/linux-sh/AndroidConfig.h similarity index 100% rename from android-headers/android-headers-ics/system/core/include/arch/linux-sh/AndroidConfig.h rename to android-headers/14/system/core/include/arch/linux-sh/AndroidConfig.h diff --git a/android-headers/android-headers-ics/system/core/include/arch/linux-x86/AndroidConfig.h b/android-headers/14/system/core/include/arch/linux-x86/AndroidConfig.h similarity index 100% rename from android-headers/android-headers-ics/system/core/include/arch/linux-x86/AndroidConfig.h rename to android-headers/14/system/core/include/arch/linux-x86/AndroidConfig.h diff --git a/android-headers/android-headers-ics/system/core/include/arch/target_linux-x86/AndroidConfig.h b/android-headers/14/system/core/include/arch/target_linux-x86/AndroidConfig.h similarity index 100% rename from android-headers/android-headers-ics/system/core/include/arch/target_linux-x86/AndroidConfig.h rename to android-headers/14/system/core/include/arch/target_linux-x86/AndroidConfig.h diff --git a/android-headers/android-headers-ics/system/core/include/arch/windows/AndroidConfig.h b/android-headers/14/system/core/include/arch/windows/AndroidConfig.h similarity index 100% rename from android-headers/android-headers-ics/system/core/include/arch/windows/AndroidConfig.h rename to android-headers/14/system/core/include/arch/windows/AndroidConfig.h diff --git a/android-headers/android-headers-ics/system/core/include/ctest/ctest.h b/android-headers/14/system/core/include/ctest/ctest.h similarity index 100% rename from android-headers/android-headers-ics/system/core/include/ctest/ctest.h rename to android-headers/14/system/core/include/ctest/ctest.h diff --git a/android-headers/android-headers-ics/system/core/include/cutils/abort_socket.h b/android-headers/14/system/core/include/cutils/abort_socket.h similarity index 100% rename from android-headers/android-headers-ics/system/core/include/cutils/abort_socket.h rename to android-headers/14/system/core/include/cutils/abort_socket.h diff --git a/android-headers/android-headers-ics/system/core/include/cutils/android_reboot.h b/android-headers/14/system/core/include/cutils/android_reboot.h similarity index 100% rename from android-headers/android-headers-ics/system/core/include/cutils/android_reboot.h rename to android-headers/14/system/core/include/cutils/android_reboot.h diff --git a/android-headers/android-headers-ics/system/core/include/cutils/array.h b/android-headers/14/system/core/include/cutils/array.h similarity index 100% rename from android-headers/android-headers-ics/system/core/include/cutils/array.h rename to android-headers/14/system/core/include/cutils/array.h diff --git a/android-headers/android-headers-ics/system/core/include/cutils/ashmem.h b/android-headers/14/system/core/include/cutils/ashmem.h similarity index 100% rename from android-headers/android-headers-ics/system/core/include/cutils/ashmem.h rename to android-headers/14/system/core/include/cutils/ashmem.h diff --git a/android-headers/android-headers-ics/system/core/include/cutils/atomic-arm.h b/android-headers/14/system/core/include/cutils/atomic-arm.h similarity index 100% rename from android-headers/android-headers-ics/system/core/include/cutils/atomic-arm.h rename to android-headers/14/system/core/include/cutils/atomic-arm.h diff --git a/android-headers/android-headers-ics/system/core/include/cutils/atomic-inline.h b/android-headers/14/system/core/include/cutils/atomic-inline.h similarity index 100% rename from android-headers/android-headers-ics/system/core/include/cutils/atomic-inline.h rename to android-headers/14/system/core/include/cutils/atomic-inline.h diff --git a/android-headers/android-headers-ics/system/core/include/cutils/atomic-x86.h b/android-headers/14/system/core/include/cutils/atomic-x86.h similarity index 100% rename from android-headers/android-headers-ics/system/core/include/cutils/atomic-x86.h rename to android-headers/14/system/core/include/cutils/atomic-x86.h diff --git a/android-headers/android-headers-ics/system/core/include/cutils/atomic.h b/android-headers/14/system/core/include/cutils/atomic.h similarity index 100% rename from android-headers/android-headers-ics/system/core/include/cutils/atomic.h rename to android-headers/14/system/core/include/cutils/atomic.h diff --git a/android-headers/android-headers-ics/system/core/include/cutils/bitops.h b/android-headers/14/system/core/include/cutils/bitops.h similarity index 100% rename from android-headers/android-headers-ics/system/core/include/cutils/bitops.h rename to android-headers/14/system/core/include/cutils/bitops.h diff --git a/android-headers/android-headers-ics/system/core/include/cutils/compiler.h b/android-headers/14/system/core/include/cutils/compiler.h similarity index 100% rename from android-headers/android-headers-ics/system/core/include/cutils/compiler.h rename to android-headers/14/system/core/include/cutils/compiler.h diff --git a/android-headers/android-headers-ics/system/core/include/cutils/config_utils.h b/android-headers/14/system/core/include/cutils/config_utils.h similarity index 100% rename from android-headers/android-headers-ics/system/core/include/cutils/config_utils.h rename to android-headers/14/system/core/include/cutils/config_utils.h diff --git a/android-headers/android-headers-ics/system/core/include/cutils/cpu_info.h b/android-headers/14/system/core/include/cutils/cpu_info.h similarity index 100% rename from android-headers/android-headers-ics/system/core/include/cutils/cpu_info.h rename to android-headers/14/system/core/include/cutils/cpu_info.h diff --git a/android-headers/android-headers-ics/system/core/include/cutils/dir_hash.h b/android-headers/14/system/core/include/cutils/dir_hash.h similarity index 100% rename from android-headers/android-headers-ics/system/core/include/cutils/dir_hash.h rename to android-headers/14/system/core/include/cutils/dir_hash.h diff --git a/android-headers/android-headers-ics/system/core/include/cutils/event_tag_map.h b/android-headers/14/system/core/include/cutils/event_tag_map.h similarity index 100% rename from android-headers/android-headers-ics/system/core/include/cutils/event_tag_map.h rename to android-headers/14/system/core/include/cutils/event_tag_map.h diff --git a/android-headers/android-headers-ics/system/core/include/cutils/hashmap.h b/android-headers/14/system/core/include/cutils/hashmap.h similarity index 100% rename from android-headers/android-headers-ics/system/core/include/cutils/hashmap.h rename to android-headers/14/system/core/include/cutils/hashmap.h diff --git a/android-headers/android-headers-ics/system/core/include/cutils/iosched_policy.h b/android-headers/14/system/core/include/cutils/iosched_policy.h similarity index 100% rename from android-headers/android-headers-ics/system/core/include/cutils/iosched_policy.h rename to android-headers/14/system/core/include/cutils/iosched_policy.h diff --git a/android-headers/android-headers-ics/system/core/include/cutils/jstring.h b/android-headers/14/system/core/include/cutils/jstring.h similarity index 100% rename from android-headers/android-headers-ics/system/core/include/cutils/jstring.h rename to android-headers/14/system/core/include/cutils/jstring.h diff --git a/android-headers/android-headers-ics/system/core/include/cutils/klog.h b/android-headers/14/system/core/include/cutils/klog.h similarity index 100% rename from android-headers/android-headers-ics/system/core/include/cutils/klog.h rename to android-headers/14/system/core/include/cutils/klog.h diff --git a/android-headers/android-headers-ics/system/core/include/cutils/list.h b/android-headers/14/system/core/include/cutils/list.h similarity index 100% rename from android-headers/android-headers-ics/system/core/include/cutils/list.h rename to android-headers/14/system/core/include/cutils/list.h diff --git a/android-headers/android-headers-ics/system/core/include/cutils/log.h b/android-headers/14/system/core/include/cutils/log.h similarity index 100% rename from android-headers/android-headers-ics/system/core/include/cutils/log.h rename to android-headers/14/system/core/include/cutils/log.h diff --git a/android-headers/android-headers-ics/system/core/include/cutils/logd.h b/android-headers/14/system/core/include/cutils/logd.h similarity index 100% rename from android-headers/android-headers-ics/system/core/include/cutils/logd.h rename to android-headers/14/system/core/include/cutils/logd.h diff --git a/android-headers/android-headers-ics/system/core/include/cutils/logger.h b/android-headers/14/system/core/include/cutils/logger.h similarity index 100% rename from android-headers/android-headers-ics/system/core/include/cutils/logger.h rename to android-headers/14/system/core/include/cutils/logger.h diff --git a/android-headers/android-headers-ics/system/core/include/cutils/logprint.h b/android-headers/14/system/core/include/cutils/logprint.h similarity index 100% rename from android-headers/android-headers-ics/system/core/include/cutils/logprint.h rename to android-headers/14/system/core/include/cutils/logprint.h diff --git a/android-headers/android-headers-ics/system/core/include/cutils/memory.h b/android-headers/14/system/core/include/cutils/memory.h similarity index 100% rename from android-headers/android-headers-ics/system/core/include/cutils/memory.h rename to android-headers/14/system/core/include/cutils/memory.h diff --git a/android-headers/android-headers-ics/system/core/include/cutils/misc.h b/android-headers/14/system/core/include/cutils/misc.h similarity index 100% rename from android-headers/android-headers-ics/system/core/include/cutils/misc.h rename to android-headers/14/system/core/include/cutils/misc.h diff --git a/android-headers/android-headers-ics/system/core/include/cutils/mq.h b/android-headers/14/system/core/include/cutils/mq.h similarity index 100% rename from android-headers/android-headers-ics/system/core/include/cutils/mq.h rename to android-headers/14/system/core/include/cutils/mq.h diff --git a/android-headers/android-headers-ics/system/core/include/cutils/mspace.h b/android-headers/14/system/core/include/cutils/mspace.h similarity index 100% rename from android-headers/android-headers-ics/system/core/include/cutils/mspace.h rename to android-headers/14/system/core/include/cutils/mspace.h diff --git a/android-headers/android-headers-ics/system/core/include/cutils/native_handle.h b/android-headers/14/system/core/include/cutils/native_handle.h similarity index 100% rename from android-headers/android-headers-ics/system/core/include/cutils/native_handle.h rename to android-headers/14/system/core/include/cutils/native_handle.h diff --git a/android-headers/android-headers-ics/system/core/include/cutils/open_memstream.h b/android-headers/14/system/core/include/cutils/open_memstream.h similarity index 100% rename from android-headers/android-headers-ics/system/core/include/cutils/open_memstream.h rename to android-headers/14/system/core/include/cutils/open_memstream.h diff --git a/android-headers/android-headers-ics/system/core/include/cutils/partition_utils.h b/android-headers/14/system/core/include/cutils/partition_utils.h similarity index 100% rename from android-headers/android-headers-ics/system/core/include/cutils/partition_utils.h rename to android-headers/14/system/core/include/cutils/partition_utils.h diff --git a/android-headers/android-headers-ics/system/core/include/cutils/process_name.h b/android-headers/14/system/core/include/cutils/process_name.h similarity index 100% rename from android-headers/android-headers-ics/system/core/include/cutils/process_name.h rename to android-headers/14/system/core/include/cutils/process_name.h diff --git a/android-headers/android-headers-ics/system/core/include/cutils/properties.h b/android-headers/14/system/core/include/cutils/properties.h similarity index 100% rename from android-headers/android-headers-ics/system/core/include/cutils/properties.h rename to android-headers/14/system/core/include/cutils/properties.h diff --git a/android-headers/android-headers-ics/system/core/include/cutils/qtaguid.h b/android-headers/14/system/core/include/cutils/qtaguid.h similarity index 100% rename from android-headers/android-headers-ics/system/core/include/cutils/qtaguid.h rename to android-headers/14/system/core/include/cutils/qtaguid.h diff --git a/android-headers/android-headers-ics/system/core/include/cutils/record_stream.h b/android-headers/14/system/core/include/cutils/record_stream.h similarity index 100% rename from android-headers/android-headers-ics/system/core/include/cutils/record_stream.h rename to android-headers/14/system/core/include/cutils/record_stream.h diff --git a/android-headers/android-headers-ics/system/core/include/cutils/sched_policy.h b/android-headers/14/system/core/include/cutils/sched_policy.h similarity index 100% rename from android-headers/android-headers-ics/system/core/include/cutils/sched_policy.h rename to android-headers/14/system/core/include/cutils/sched_policy.h diff --git a/android-headers/android-headers-ics/system/core/include/cutils/selector.h b/android-headers/14/system/core/include/cutils/selector.h similarity index 100% rename from android-headers/android-headers-ics/system/core/include/cutils/selector.h rename to android-headers/14/system/core/include/cutils/selector.h diff --git a/android-headers/android-headers-ics/system/core/include/cutils/sockets.h b/android-headers/14/system/core/include/cutils/sockets.h similarity index 100% rename from android-headers/android-headers-ics/system/core/include/cutils/sockets.h rename to android-headers/14/system/core/include/cutils/sockets.h diff --git a/android-headers/android-headers-ics/system/core/include/cutils/str_parms.h b/android-headers/14/system/core/include/cutils/str_parms.h similarity index 100% rename from android-headers/android-headers-ics/system/core/include/cutils/str_parms.h rename to android-headers/14/system/core/include/cutils/str_parms.h diff --git a/android-headers/android-headers-ics/system/core/include/cutils/threads.h b/android-headers/14/system/core/include/cutils/threads.h similarity index 100% rename from android-headers/android-headers-ics/system/core/include/cutils/threads.h rename to android-headers/14/system/core/include/cutils/threads.h diff --git a/android-headers/android-headers-ics/system/core/include/cutils/tztime.h b/android-headers/14/system/core/include/cutils/tztime.h similarity index 100% rename from android-headers/android-headers-ics/system/core/include/cutils/tztime.h rename to android-headers/14/system/core/include/cutils/tztime.h diff --git a/android-headers/android-headers-ics/system/core/include/cutils/uevent.h b/android-headers/14/system/core/include/cutils/uevent.h similarity index 100% rename from android-headers/android-headers-ics/system/core/include/cutils/uevent.h rename to android-headers/14/system/core/include/cutils/uevent.h diff --git a/android-headers/android-headers-ics/system/core/include/cutils/uio.h b/android-headers/14/system/core/include/cutils/uio.h similarity index 100% rename from android-headers/android-headers-ics/system/core/include/cutils/uio.h rename to android-headers/14/system/core/include/cutils/uio.h diff --git a/android-headers/android-headers-ics/system/core/include/cutils/zygote.h b/android-headers/14/system/core/include/cutils/zygote.h similarity index 100% rename from android-headers/android-headers-ics/system/core/include/cutils/zygote.h rename to android-headers/14/system/core/include/cutils/zygote.h diff --git a/android-headers/android-headers-ics/system/core/include/diskconfig/diskconfig.h b/android-headers/14/system/core/include/diskconfig/diskconfig.h similarity index 100% rename from android-headers/android-headers-ics/system/core/include/diskconfig/diskconfig.h rename to android-headers/14/system/core/include/diskconfig/diskconfig.h diff --git a/android-headers/android-headers-ics/system/core/include/mincrypt/rsa.h b/android-headers/14/system/core/include/mincrypt/rsa.h similarity index 100% rename from android-headers/android-headers-ics/system/core/include/mincrypt/rsa.h rename to android-headers/14/system/core/include/mincrypt/rsa.h diff --git a/android-headers/android-headers-ics/system/core/include/mincrypt/sha.h b/android-headers/14/system/core/include/mincrypt/sha.h similarity index 100% rename from android-headers/android-headers-ics/system/core/include/mincrypt/sha.h rename to android-headers/14/system/core/include/mincrypt/sha.h diff --git a/android-headers/android-headers-ics/system/core/include/netutils/dhcp.h b/android-headers/14/system/core/include/netutils/dhcp.h similarity index 100% rename from android-headers/android-headers-ics/system/core/include/netutils/dhcp.h rename to android-headers/14/system/core/include/netutils/dhcp.h diff --git a/android-headers/android-headers-ics/system/core/include/netutils/ifc.h b/android-headers/14/system/core/include/netutils/ifc.h similarity index 100% rename from android-headers/android-headers-ics/system/core/include/netutils/ifc.h rename to android-headers/14/system/core/include/netutils/ifc.h diff --git a/android-headers/android-headers-ics/system/core/include/pixelflinger/format.h b/android-headers/14/system/core/include/pixelflinger/format.h similarity index 100% rename from android-headers/android-headers-ics/system/core/include/pixelflinger/format.h rename to android-headers/14/system/core/include/pixelflinger/format.h diff --git a/android-headers/android-headers-ics/system/core/include/pixelflinger/pixelflinger.h b/android-headers/14/system/core/include/pixelflinger/pixelflinger.h similarity index 100% rename from android-headers/android-headers-ics/system/core/include/pixelflinger/pixelflinger.h rename to android-headers/14/system/core/include/pixelflinger/pixelflinger.h diff --git a/android-headers/android-headers-ics/system/core/include/private/android_filesystem_config.h b/android-headers/14/system/core/include/private/android_filesystem_config.h similarity index 100% rename from android-headers/android-headers-ics/system/core/include/private/android_filesystem_config.h rename to android-headers/14/system/core/include/private/android_filesystem_config.h diff --git a/android-headers/android-headers-ics/system/core/include/private/pixelflinger/ggl_context.h b/android-headers/14/system/core/include/private/pixelflinger/ggl_context.h similarity index 100% rename from android-headers/android-headers-ics/system/core/include/private/pixelflinger/ggl_context.h rename to android-headers/14/system/core/include/private/pixelflinger/ggl_context.h diff --git a/android-headers/android-headers-ics/system/core/include/private/pixelflinger/ggl_fixed.h b/android-headers/14/system/core/include/private/pixelflinger/ggl_fixed.h similarity index 100% rename from android-headers/android-headers-ics/system/core/include/private/pixelflinger/ggl_fixed.h rename to android-headers/14/system/core/include/private/pixelflinger/ggl_fixed.h diff --git a/android-headers/android-headers-ics/system/core/include/system/audio.h b/android-headers/14/system/core/include/system/audio.h similarity index 100% rename from android-headers/android-headers-ics/system/core/include/system/audio.h rename to android-headers/14/system/core/include/system/audio.h diff --git a/android-headers/android-headers-ics/system/core/include/system/audio_policy.h b/android-headers/14/system/core/include/system/audio_policy.h similarity index 100% rename from android-headers/android-headers-ics/system/core/include/system/audio_policy.h rename to android-headers/14/system/core/include/system/audio_policy.h diff --git a/android-headers/android-headers-ics/system/core/include/system/camera.h b/android-headers/14/system/core/include/system/camera.h similarity index 100% rename from android-headers/android-headers-ics/system/core/include/system/camera.h rename to android-headers/14/system/core/include/system/camera.h diff --git a/android-headers/android-headers-ics/system/core/include/system/graphics.h b/android-headers/14/system/core/include/system/graphics.h similarity index 100% rename from android-headers/android-headers-ics/system/core/include/system/graphics.h rename to android-headers/14/system/core/include/system/graphics.h diff --git a/android-headers/android-headers-ics/system/core/include/system/window.h b/android-headers/14/system/core/include/system/window.h similarity index 100% rename from android-headers/android-headers-ics/system/core/include/system/window.h rename to android-headers/14/system/core/include/system/window.h diff --git a/android-headers/android-headers-ics/system/core/include/sysutils/FrameworkClient.h b/android-headers/14/system/core/include/sysutils/FrameworkClient.h similarity index 100% rename from android-headers/android-headers-ics/system/core/include/sysutils/FrameworkClient.h rename to android-headers/14/system/core/include/sysutils/FrameworkClient.h diff --git a/android-headers/android-headers-ics/system/core/include/sysutils/FrameworkCommand.h b/android-headers/14/system/core/include/sysutils/FrameworkCommand.h similarity index 100% rename from android-headers/android-headers-ics/system/core/include/sysutils/FrameworkCommand.h rename to android-headers/14/system/core/include/sysutils/FrameworkCommand.h diff --git a/android-headers/android-headers-ics/system/core/include/sysutils/FrameworkListener.h b/android-headers/14/system/core/include/sysutils/FrameworkListener.h similarity index 100% rename from android-headers/android-headers-ics/system/core/include/sysutils/FrameworkListener.h rename to android-headers/14/system/core/include/sysutils/FrameworkListener.h diff --git a/android-headers/android-headers-ics/system/core/include/sysutils/NetlinkEvent.h b/android-headers/14/system/core/include/sysutils/NetlinkEvent.h similarity index 100% rename from android-headers/android-headers-ics/system/core/include/sysutils/NetlinkEvent.h rename to android-headers/14/system/core/include/sysutils/NetlinkEvent.h diff --git a/android-headers/android-headers-ics/system/core/include/sysutils/NetlinkListener.h b/android-headers/14/system/core/include/sysutils/NetlinkListener.h similarity index 100% rename from android-headers/android-headers-ics/system/core/include/sysutils/NetlinkListener.h rename to android-headers/14/system/core/include/sysutils/NetlinkListener.h diff --git a/android-headers/android-headers-ics/system/core/include/sysutils/ServiceManager.h b/android-headers/14/system/core/include/sysutils/ServiceManager.h similarity index 100% rename from android-headers/android-headers-ics/system/core/include/sysutils/ServiceManager.h rename to android-headers/14/system/core/include/sysutils/ServiceManager.h diff --git a/android-headers/android-headers-ics/system/core/include/sysutils/SocketClient.h b/android-headers/14/system/core/include/sysutils/SocketClient.h similarity index 100% rename from android-headers/android-headers-ics/system/core/include/sysutils/SocketClient.h rename to android-headers/14/system/core/include/sysutils/SocketClient.h diff --git a/android-headers/android-headers-ics/system/core/include/sysutils/SocketListener.h b/android-headers/14/system/core/include/sysutils/SocketListener.h similarity index 100% rename from android-headers/android-headers-ics/system/core/include/sysutils/SocketListener.h rename to android-headers/14/system/core/include/sysutils/SocketListener.h diff --git a/android-headers/android-headers-ics/system/core/include/usbhost/usbhost.h b/android-headers/14/system/core/include/usbhost/usbhost.h similarity index 100% rename from android-headers/android-headers-ics/system/core/include/usbhost/usbhost.h rename to android-headers/14/system/core/include/usbhost/usbhost.h diff --git a/android-headers/android-headers-ics/system/core/include/zipfile/zipfile.h b/android-headers/14/system/core/include/zipfile/zipfile.h similarity index 100% rename from android-headers/android-headers-ics/system/core/include/zipfile/zipfile.h rename to android-headers/14/system/core/include/zipfile/zipfile.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/AudioBufferProvider.h b/android-headers/18/frameworks/av/include/media/AudioBufferProvider.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/AudioBufferProvider.h rename to android-headers/18/frameworks/av/include/media/AudioBufferProvider.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/AudioEffect.h b/android-headers/18/frameworks/av/include/media/AudioEffect.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/AudioEffect.h rename to android-headers/18/frameworks/av/include/media/AudioEffect.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/AudioParameter.h b/android-headers/18/frameworks/av/include/media/AudioParameter.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/AudioParameter.h rename to android-headers/18/frameworks/av/include/media/AudioParameter.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/AudioRecord.h b/android-headers/18/frameworks/av/include/media/AudioRecord.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/AudioRecord.h rename to android-headers/18/frameworks/av/include/media/AudioRecord.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/AudioSystem.h b/android-headers/18/frameworks/av/include/media/AudioSystem.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/AudioSystem.h rename to android-headers/18/frameworks/av/include/media/AudioSystem.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/AudioTrack.h b/android-headers/18/frameworks/av/include/media/AudioTrack.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/AudioTrack.h rename to android-headers/18/frameworks/av/include/media/AudioTrack.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/EffectsFactoryApi.h b/android-headers/18/frameworks/av/include/media/EffectsFactoryApi.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/EffectsFactoryApi.h rename to android-headers/18/frameworks/av/include/media/EffectsFactoryApi.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/ExtendedAudioBufferProvider.h b/android-headers/18/frameworks/av/include/media/ExtendedAudioBufferProvider.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/ExtendedAudioBufferProvider.h rename to android-headers/18/frameworks/av/include/media/ExtendedAudioBufferProvider.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/IAudioFlinger.h b/android-headers/18/frameworks/av/include/media/IAudioFlinger.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/IAudioFlinger.h rename to android-headers/18/frameworks/av/include/media/IAudioFlinger.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/IAudioFlingerClient.h b/android-headers/18/frameworks/av/include/media/IAudioFlingerClient.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/IAudioFlingerClient.h rename to android-headers/18/frameworks/av/include/media/IAudioFlingerClient.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/IAudioPolicyService.h b/android-headers/18/frameworks/av/include/media/IAudioPolicyService.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/IAudioPolicyService.h rename to android-headers/18/frameworks/av/include/media/IAudioPolicyService.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/IAudioRecord.h b/android-headers/18/frameworks/av/include/media/IAudioRecord.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/IAudioRecord.h rename to android-headers/18/frameworks/av/include/media/IAudioRecord.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/IAudioTrack.h b/android-headers/18/frameworks/av/include/media/IAudioTrack.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/IAudioTrack.h rename to android-headers/18/frameworks/av/include/media/IAudioTrack.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/ICrypto.h b/android-headers/18/frameworks/av/include/media/ICrypto.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/ICrypto.h rename to android-headers/18/frameworks/av/include/media/ICrypto.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/IDrm.h b/android-headers/18/frameworks/av/include/media/IDrm.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/IDrm.h rename to android-headers/18/frameworks/av/include/media/IDrm.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/IDrmClient.h b/android-headers/18/frameworks/av/include/media/IDrmClient.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/IDrmClient.h rename to android-headers/18/frameworks/av/include/media/IDrmClient.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/IEffect.h b/android-headers/18/frameworks/av/include/media/IEffect.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/IEffect.h rename to android-headers/18/frameworks/av/include/media/IEffect.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/IEffectClient.h b/android-headers/18/frameworks/av/include/media/IEffectClient.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/IEffectClient.h rename to android-headers/18/frameworks/av/include/media/IEffectClient.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/IHDCP.h b/android-headers/18/frameworks/av/include/media/IHDCP.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/IHDCP.h rename to android-headers/18/frameworks/av/include/media/IHDCP.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/IMediaDeathNotifier.h b/android-headers/18/frameworks/av/include/media/IMediaDeathNotifier.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/IMediaDeathNotifier.h rename to android-headers/18/frameworks/av/include/media/IMediaDeathNotifier.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/IMediaLogService.h b/android-headers/18/frameworks/av/include/media/IMediaLogService.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/IMediaLogService.h rename to android-headers/18/frameworks/av/include/media/IMediaLogService.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/IMediaMetadataRetriever.h b/android-headers/18/frameworks/av/include/media/IMediaMetadataRetriever.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/IMediaMetadataRetriever.h rename to android-headers/18/frameworks/av/include/media/IMediaMetadataRetriever.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/IMediaPlayer.h b/android-headers/18/frameworks/av/include/media/IMediaPlayer.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/IMediaPlayer.h rename to android-headers/18/frameworks/av/include/media/IMediaPlayer.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/IMediaPlayerClient.h b/android-headers/18/frameworks/av/include/media/IMediaPlayerClient.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/IMediaPlayerClient.h rename to android-headers/18/frameworks/av/include/media/IMediaPlayerClient.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/IMediaPlayerService.h b/android-headers/18/frameworks/av/include/media/IMediaPlayerService.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/IMediaPlayerService.h rename to android-headers/18/frameworks/av/include/media/IMediaPlayerService.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/IMediaRecorder.h b/android-headers/18/frameworks/av/include/media/IMediaRecorder.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/IMediaRecorder.h rename to android-headers/18/frameworks/av/include/media/IMediaRecorder.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/IMediaRecorderClient.h b/android-headers/18/frameworks/av/include/media/IMediaRecorderClient.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/IMediaRecorderClient.h rename to android-headers/18/frameworks/av/include/media/IMediaRecorderClient.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/IOMX.h b/android-headers/18/frameworks/av/include/media/IOMX.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/IOMX.h rename to android-headers/18/frameworks/av/include/media/IOMX.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/IRemoteDisplay.h b/android-headers/18/frameworks/av/include/media/IRemoteDisplay.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/IRemoteDisplay.h rename to android-headers/18/frameworks/av/include/media/IRemoteDisplay.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/IRemoteDisplayClient.h b/android-headers/18/frameworks/av/include/media/IRemoteDisplayClient.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/IRemoteDisplayClient.h rename to android-headers/18/frameworks/av/include/media/IRemoteDisplayClient.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/IStreamSource.h b/android-headers/18/frameworks/av/include/media/IStreamSource.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/IStreamSource.h rename to android-headers/18/frameworks/av/include/media/IStreamSource.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/JetPlayer.h b/android-headers/18/frameworks/av/include/media/JetPlayer.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/JetPlayer.h rename to android-headers/18/frameworks/av/include/media/JetPlayer.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/MediaMetadataRetrieverInterface.h b/android-headers/18/frameworks/av/include/media/MediaMetadataRetrieverInterface.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/MediaMetadataRetrieverInterface.h rename to android-headers/18/frameworks/av/include/media/MediaMetadataRetrieverInterface.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/MediaPlayerInterface.h b/android-headers/18/frameworks/av/include/media/MediaPlayerInterface.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/MediaPlayerInterface.h rename to android-headers/18/frameworks/av/include/media/MediaPlayerInterface.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/MediaProfiles.h b/android-headers/18/frameworks/av/include/media/MediaProfiles.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/MediaProfiles.h rename to android-headers/18/frameworks/av/include/media/MediaProfiles.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/MediaRecorderBase.h b/android-headers/18/frameworks/av/include/media/MediaRecorderBase.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/MediaRecorderBase.h rename to android-headers/18/frameworks/av/include/media/MediaRecorderBase.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/MemoryLeakTrackUtil.h b/android-headers/18/frameworks/av/include/media/MemoryLeakTrackUtil.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/MemoryLeakTrackUtil.h rename to android-headers/18/frameworks/av/include/media/MemoryLeakTrackUtil.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/Metadata.h b/android-headers/18/frameworks/av/include/media/Metadata.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/Metadata.h rename to android-headers/18/frameworks/av/include/media/Metadata.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/SingleStateQueue.h b/android-headers/18/frameworks/av/include/media/SingleStateQueue.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/SingleStateQueue.h rename to android-headers/18/frameworks/av/include/media/SingleStateQueue.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/SoundPool.h b/android-headers/18/frameworks/av/include/media/SoundPool.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/SoundPool.h rename to android-headers/18/frameworks/av/include/media/SoundPool.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/ToneGenerator.h b/android-headers/18/frameworks/av/include/media/ToneGenerator.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/ToneGenerator.h rename to android-headers/18/frameworks/av/include/media/ToneGenerator.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/Visualizer.h b/android-headers/18/frameworks/av/include/media/Visualizer.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/Visualizer.h rename to android-headers/18/frameworks/av/include/media/Visualizer.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/mediametadataretriever.h b/android-headers/18/frameworks/av/include/media/mediametadataretriever.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/mediametadataretriever.h rename to android-headers/18/frameworks/av/include/media/mediametadataretriever.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/mediaplayer.h b/android-headers/18/frameworks/av/include/media/mediaplayer.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/mediaplayer.h rename to android-headers/18/frameworks/av/include/media/mediaplayer.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/mediarecorder.h b/android-headers/18/frameworks/av/include/media/mediarecorder.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/mediarecorder.h rename to android-headers/18/frameworks/av/include/media/mediarecorder.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/mediascanner.h b/android-headers/18/frameworks/av/include/media/mediascanner.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/mediascanner.h rename to android-headers/18/frameworks/av/include/media/mediascanner.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/nbaio/AudioBufferProviderSource.h b/android-headers/18/frameworks/av/include/media/nbaio/AudioBufferProviderSource.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/nbaio/AudioBufferProviderSource.h rename to android-headers/18/frameworks/av/include/media/nbaio/AudioBufferProviderSource.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/nbaio/AudioStreamInSource.h b/android-headers/18/frameworks/av/include/media/nbaio/AudioStreamInSource.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/nbaio/AudioStreamInSource.h rename to android-headers/18/frameworks/av/include/media/nbaio/AudioStreamInSource.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/nbaio/AudioStreamOutSink.h b/android-headers/18/frameworks/av/include/media/nbaio/AudioStreamOutSink.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/nbaio/AudioStreamOutSink.h rename to android-headers/18/frameworks/av/include/media/nbaio/AudioStreamOutSink.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/nbaio/LibsndfileSink.h b/android-headers/18/frameworks/av/include/media/nbaio/LibsndfileSink.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/nbaio/LibsndfileSink.h rename to android-headers/18/frameworks/av/include/media/nbaio/LibsndfileSink.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/nbaio/LibsndfileSource.h b/android-headers/18/frameworks/av/include/media/nbaio/LibsndfileSource.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/nbaio/LibsndfileSource.h rename to android-headers/18/frameworks/av/include/media/nbaio/LibsndfileSource.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/nbaio/MonoPipe.h b/android-headers/18/frameworks/av/include/media/nbaio/MonoPipe.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/nbaio/MonoPipe.h rename to android-headers/18/frameworks/av/include/media/nbaio/MonoPipe.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/nbaio/MonoPipeReader.h b/android-headers/18/frameworks/av/include/media/nbaio/MonoPipeReader.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/nbaio/MonoPipeReader.h rename to android-headers/18/frameworks/av/include/media/nbaio/MonoPipeReader.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/nbaio/NBAIO.h b/android-headers/18/frameworks/av/include/media/nbaio/NBAIO.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/nbaio/NBAIO.h rename to android-headers/18/frameworks/av/include/media/nbaio/NBAIO.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/nbaio/NBLog.h b/android-headers/18/frameworks/av/include/media/nbaio/NBLog.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/nbaio/NBLog.h rename to android-headers/18/frameworks/av/include/media/nbaio/NBLog.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/nbaio/Pipe.h b/android-headers/18/frameworks/av/include/media/nbaio/Pipe.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/nbaio/Pipe.h rename to android-headers/18/frameworks/av/include/media/nbaio/Pipe.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/nbaio/PipeReader.h b/android-headers/18/frameworks/av/include/media/nbaio/PipeReader.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/nbaio/PipeReader.h rename to android-headers/18/frameworks/av/include/media/nbaio/PipeReader.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/nbaio/SourceAudioBufferProvider.h b/android-headers/18/frameworks/av/include/media/nbaio/SourceAudioBufferProvider.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/nbaio/SourceAudioBufferProvider.h rename to android-headers/18/frameworks/av/include/media/nbaio/SourceAudioBufferProvider.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/nbaio/roundup.h b/android-headers/18/frameworks/av/include/media/nbaio/roundup.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/nbaio/roundup.h rename to android-headers/18/frameworks/av/include/media/nbaio/roundup.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/stagefright/AACWriter.h b/android-headers/18/frameworks/av/include/media/stagefright/AACWriter.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/stagefright/AACWriter.h rename to android-headers/18/frameworks/av/include/media/stagefright/AACWriter.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/stagefright/ACodec.h b/android-headers/18/frameworks/av/include/media/stagefright/ACodec.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/stagefright/ACodec.h rename to android-headers/18/frameworks/av/include/media/stagefright/ACodec.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/stagefright/AMRWriter.h b/android-headers/18/frameworks/av/include/media/stagefright/AMRWriter.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/stagefright/AMRWriter.h rename to android-headers/18/frameworks/av/include/media/stagefright/AMRWriter.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/stagefright/AudioPlayer.h b/android-headers/18/frameworks/av/include/media/stagefright/AudioPlayer.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/stagefright/AudioPlayer.h rename to android-headers/18/frameworks/av/include/media/stagefright/AudioPlayer.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/stagefright/AudioSource.h b/android-headers/18/frameworks/av/include/media/stagefright/AudioSource.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/stagefright/AudioSource.h rename to android-headers/18/frameworks/av/include/media/stagefright/AudioSource.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/stagefright/BufferProducerWrapper.h b/android-headers/18/frameworks/av/include/media/stagefright/BufferProducerWrapper.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/stagefright/BufferProducerWrapper.h rename to android-headers/18/frameworks/av/include/media/stagefright/BufferProducerWrapper.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/stagefright/CameraSource.h b/android-headers/18/frameworks/av/include/media/stagefright/CameraSource.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/stagefright/CameraSource.h rename to android-headers/18/frameworks/av/include/media/stagefright/CameraSource.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/stagefright/CameraSourceTimeLapse.h b/android-headers/18/frameworks/av/include/media/stagefright/CameraSourceTimeLapse.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/stagefright/CameraSourceTimeLapse.h rename to android-headers/18/frameworks/av/include/media/stagefright/CameraSourceTimeLapse.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/stagefright/ColorConverter.h b/android-headers/18/frameworks/av/include/media/stagefright/ColorConverter.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/stagefright/ColorConverter.h rename to android-headers/18/frameworks/av/include/media/stagefright/ColorConverter.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/stagefright/DataSource.h b/android-headers/18/frameworks/av/include/media/stagefright/DataSource.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/stagefright/DataSource.h rename to android-headers/18/frameworks/av/include/media/stagefright/DataSource.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/stagefright/FileSource.h b/android-headers/18/frameworks/av/include/media/stagefright/FileSource.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/stagefright/FileSource.h rename to android-headers/18/frameworks/av/include/media/stagefright/FileSource.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/stagefright/JPEGSource.h b/android-headers/18/frameworks/av/include/media/stagefright/JPEGSource.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/stagefright/JPEGSource.h rename to android-headers/18/frameworks/av/include/media/stagefright/JPEGSource.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/stagefright/MPEG2TSWriter.h b/android-headers/18/frameworks/av/include/media/stagefright/MPEG2TSWriter.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/stagefright/MPEG2TSWriter.h rename to android-headers/18/frameworks/av/include/media/stagefright/MPEG2TSWriter.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/stagefright/MPEG4Writer.h b/android-headers/18/frameworks/av/include/media/stagefright/MPEG4Writer.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/stagefright/MPEG4Writer.h rename to android-headers/18/frameworks/av/include/media/stagefright/MPEG4Writer.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/stagefright/MediaAdapter.h b/android-headers/18/frameworks/av/include/media/stagefright/MediaAdapter.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/stagefright/MediaAdapter.h rename to android-headers/18/frameworks/av/include/media/stagefright/MediaAdapter.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/stagefright/MediaBuffer.h b/android-headers/18/frameworks/av/include/media/stagefright/MediaBuffer.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/stagefright/MediaBuffer.h rename to android-headers/18/frameworks/av/include/media/stagefright/MediaBuffer.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/stagefright/MediaBufferGroup.h b/android-headers/18/frameworks/av/include/media/stagefright/MediaBufferGroup.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/stagefright/MediaBufferGroup.h rename to android-headers/18/frameworks/av/include/media/stagefright/MediaBufferGroup.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/stagefright/MediaCodec.h b/android-headers/18/frameworks/av/include/media/stagefright/MediaCodec.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/stagefright/MediaCodec.h rename to android-headers/18/frameworks/av/include/media/stagefright/MediaCodec.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/stagefright/MediaCodecList.h b/android-headers/18/frameworks/av/include/media/stagefright/MediaCodecList.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/stagefright/MediaCodecList.h rename to android-headers/18/frameworks/av/include/media/stagefright/MediaCodecList.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/stagefright/MediaDefs.h b/android-headers/18/frameworks/av/include/media/stagefright/MediaDefs.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/stagefright/MediaDefs.h rename to android-headers/18/frameworks/av/include/media/stagefright/MediaDefs.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/stagefright/MediaErrors.h b/android-headers/18/frameworks/av/include/media/stagefright/MediaErrors.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/stagefright/MediaErrors.h rename to android-headers/18/frameworks/av/include/media/stagefright/MediaErrors.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/stagefright/MediaExtractor.h b/android-headers/18/frameworks/av/include/media/stagefright/MediaExtractor.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/stagefright/MediaExtractor.h rename to android-headers/18/frameworks/av/include/media/stagefright/MediaExtractor.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/stagefright/MediaMuxer.h b/android-headers/18/frameworks/av/include/media/stagefright/MediaMuxer.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/stagefright/MediaMuxer.h rename to android-headers/18/frameworks/av/include/media/stagefright/MediaMuxer.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/stagefright/MediaSource.h b/android-headers/18/frameworks/av/include/media/stagefright/MediaSource.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/stagefright/MediaSource.h rename to android-headers/18/frameworks/av/include/media/stagefright/MediaSource.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/stagefright/MediaWriter.h b/android-headers/18/frameworks/av/include/media/stagefright/MediaWriter.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/stagefright/MediaWriter.h rename to android-headers/18/frameworks/av/include/media/stagefright/MediaWriter.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/stagefright/MetaData.h b/android-headers/18/frameworks/av/include/media/stagefright/MetaData.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/stagefright/MetaData.h rename to android-headers/18/frameworks/av/include/media/stagefright/MetaData.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/stagefright/NativeWindowWrapper.h b/android-headers/18/frameworks/av/include/media/stagefright/NativeWindowWrapper.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/stagefright/NativeWindowWrapper.h rename to android-headers/18/frameworks/av/include/media/stagefright/NativeWindowWrapper.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/stagefright/NuMediaExtractor.h b/android-headers/18/frameworks/av/include/media/stagefright/NuMediaExtractor.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/stagefright/NuMediaExtractor.h rename to android-headers/18/frameworks/av/include/media/stagefright/NuMediaExtractor.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/stagefright/OMXClient.h b/android-headers/18/frameworks/av/include/media/stagefright/OMXClient.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/stagefright/OMXClient.h rename to android-headers/18/frameworks/av/include/media/stagefright/OMXClient.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/stagefright/OMXCodec.h b/android-headers/18/frameworks/av/include/media/stagefright/OMXCodec.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/stagefright/OMXCodec.h rename to android-headers/18/frameworks/av/include/media/stagefright/OMXCodec.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/stagefright/SkipCutBuffer.h b/android-headers/18/frameworks/av/include/media/stagefright/SkipCutBuffer.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/stagefright/SkipCutBuffer.h rename to android-headers/18/frameworks/av/include/media/stagefright/SkipCutBuffer.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/stagefright/StagefrightMediaScanner.h b/android-headers/18/frameworks/av/include/media/stagefright/StagefrightMediaScanner.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/stagefright/StagefrightMediaScanner.h rename to android-headers/18/frameworks/av/include/media/stagefright/StagefrightMediaScanner.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/stagefright/SurfaceMediaSource.h b/android-headers/18/frameworks/av/include/media/stagefright/SurfaceMediaSource.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/stagefright/SurfaceMediaSource.h rename to android-headers/18/frameworks/av/include/media/stagefright/SurfaceMediaSource.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/stagefright/TimeSource.h b/android-headers/18/frameworks/av/include/media/stagefright/TimeSource.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/stagefright/TimeSource.h rename to android-headers/18/frameworks/av/include/media/stagefright/TimeSource.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/stagefright/Utils.h b/android-headers/18/frameworks/av/include/media/stagefright/Utils.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/stagefright/Utils.h rename to android-headers/18/frameworks/av/include/media/stagefright/Utils.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/stagefright/YUVCanvas.h b/android-headers/18/frameworks/av/include/media/stagefright/YUVCanvas.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/stagefright/YUVCanvas.h rename to android-headers/18/frameworks/av/include/media/stagefright/YUVCanvas.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/stagefright/YUVImage.h b/android-headers/18/frameworks/av/include/media/stagefright/YUVImage.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/stagefright/YUVImage.h rename to android-headers/18/frameworks/av/include/media/stagefright/YUVImage.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/stagefright/foundation/AAtomizer.h b/android-headers/18/frameworks/av/include/media/stagefright/foundation/AAtomizer.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/stagefright/foundation/AAtomizer.h rename to android-headers/18/frameworks/av/include/media/stagefright/foundation/AAtomizer.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/stagefright/foundation/ABase.h b/android-headers/18/frameworks/av/include/media/stagefright/foundation/ABase.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/stagefright/foundation/ABase.h rename to android-headers/18/frameworks/av/include/media/stagefright/foundation/ABase.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/stagefright/foundation/ABitReader.h b/android-headers/18/frameworks/av/include/media/stagefright/foundation/ABitReader.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/stagefright/foundation/ABitReader.h rename to android-headers/18/frameworks/av/include/media/stagefright/foundation/ABitReader.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/stagefright/foundation/ABuffer.h b/android-headers/18/frameworks/av/include/media/stagefright/foundation/ABuffer.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/stagefright/foundation/ABuffer.h rename to android-headers/18/frameworks/av/include/media/stagefright/foundation/ABuffer.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/stagefright/foundation/ADebug.h b/android-headers/18/frameworks/av/include/media/stagefright/foundation/ADebug.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/stagefright/foundation/ADebug.h rename to android-headers/18/frameworks/av/include/media/stagefright/foundation/ADebug.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/stagefright/foundation/AHandler.h b/android-headers/18/frameworks/av/include/media/stagefright/foundation/AHandler.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/stagefright/foundation/AHandler.h rename to android-headers/18/frameworks/av/include/media/stagefright/foundation/AHandler.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/stagefright/foundation/AHandlerReflector.h b/android-headers/18/frameworks/av/include/media/stagefright/foundation/AHandlerReflector.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/stagefright/foundation/AHandlerReflector.h rename to android-headers/18/frameworks/av/include/media/stagefright/foundation/AHandlerReflector.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/stagefright/foundation/AHierarchicalStateMachine.h b/android-headers/18/frameworks/av/include/media/stagefright/foundation/AHierarchicalStateMachine.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/stagefright/foundation/AHierarchicalStateMachine.h rename to android-headers/18/frameworks/av/include/media/stagefright/foundation/AHierarchicalStateMachine.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/stagefright/foundation/ALooper.h b/android-headers/18/frameworks/av/include/media/stagefright/foundation/ALooper.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/stagefright/foundation/ALooper.h rename to android-headers/18/frameworks/av/include/media/stagefright/foundation/ALooper.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/stagefright/foundation/ALooperRoster.h b/android-headers/18/frameworks/av/include/media/stagefright/foundation/ALooperRoster.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/stagefright/foundation/ALooperRoster.h rename to android-headers/18/frameworks/av/include/media/stagefright/foundation/ALooperRoster.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/stagefright/foundation/AMessage.h b/android-headers/18/frameworks/av/include/media/stagefright/foundation/AMessage.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/stagefright/foundation/AMessage.h rename to android-headers/18/frameworks/av/include/media/stagefright/foundation/AMessage.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/stagefright/foundation/AString.h b/android-headers/18/frameworks/av/include/media/stagefright/foundation/AString.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/stagefright/foundation/AString.h rename to android-headers/18/frameworks/av/include/media/stagefright/foundation/AString.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/stagefright/foundation/base64.h b/android-headers/18/frameworks/av/include/media/stagefright/foundation/base64.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/stagefright/foundation/base64.h rename to android-headers/18/frameworks/av/include/media/stagefright/foundation/base64.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/stagefright/foundation/hexdump.h b/android-headers/18/frameworks/av/include/media/stagefright/foundation/hexdump.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/stagefright/foundation/hexdump.h rename to android-headers/18/frameworks/av/include/media/stagefright/foundation/hexdump.h diff --git a/android-headers/android-headers-jbmr2/frameworks/av/include/media/stagefright/timedtext/TimedTextDriver.h b/android-headers/18/frameworks/av/include/media/stagefright/timedtext/TimedTextDriver.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/av/include/media/stagefright/timedtext/TimedTextDriver.h rename to android-headers/18/frameworks/av/include/media/stagefright/timedtext/TimedTextDriver.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/binder/AppOpsManager.h b/android-headers/18/frameworks/native/include/binder/AppOpsManager.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/binder/AppOpsManager.h rename to android-headers/18/frameworks/native/include/binder/AppOpsManager.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/binder/Binder.h b/android-headers/18/frameworks/native/include/binder/Binder.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/binder/Binder.h rename to android-headers/18/frameworks/native/include/binder/Binder.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/binder/BinderService.h b/android-headers/18/frameworks/native/include/binder/BinderService.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/binder/BinderService.h rename to android-headers/18/frameworks/native/include/binder/BinderService.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/binder/BpBinder.h b/android-headers/18/frameworks/native/include/binder/BpBinder.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/binder/BpBinder.h rename to android-headers/18/frameworks/native/include/binder/BpBinder.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/binder/IAppOpsCallback.h b/android-headers/18/frameworks/native/include/binder/IAppOpsCallback.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/binder/IAppOpsCallback.h rename to android-headers/18/frameworks/native/include/binder/IAppOpsCallback.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/binder/IAppOpsService.h b/android-headers/18/frameworks/native/include/binder/IAppOpsService.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/binder/IAppOpsService.h rename to android-headers/18/frameworks/native/include/binder/IAppOpsService.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/binder/IBinder.h b/android-headers/18/frameworks/native/include/binder/IBinder.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/binder/IBinder.h rename to android-headers/18/frameworks/native/include/binder/IBinder.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/binder/IInterface.h b/android-headers/18/frameworks/native/include/binder/IInterface.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/binder/IInterface.h rename to android-headers/18/frameworks/native/include/binder/IInterface.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/binder/IMemory.h b/android-headers/18/frameworks/native/include/binder/IMemory.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/binder/IMemory.h rename to android-headers/18/frameworks/native/include/binder/IMemory.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/binder/IPCThreadState.h b/android-headers/18/frameworks/native/include/binder/IPCThreadState.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/binder/IPCThreadState.h rename to android-headers/18/frameworks/native/include/binder/IPCThreadState.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/binder/IPermissionController.h b/android-headers/18/frameworks/native/include/binder/IPermissionController.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/binder/IPermissionController.h rename to android-headers/18/frameworks/native/include/binder/IPermissionController.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/binder/IServiceManager.h b/android-headers/18/frameworks/native/include/binder/IServiceManager.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/binder/IServiceManager.h rename to android-headers/18/frameworks/native/include/binder/IServiceManager.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/binder/MemoryBase.h b/android-headers/18/frameworks/native/include/binder/MemoryBase.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/binder/MemoryBase.h rename to android-headers/18/frameworks/native/include/binder/MemoryBase.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/binder/MemoryDealer.h b/android-headers/18/frameworks/native/include/binder/MemoryDealer.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/binder/MemoryDealer.h rename to android-headers/18/frameworks/native/include/binder/MemoryDealer.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/binder/MemoryHeapBase.h b/android-headers/18/frameworks/native/include/binder/MemoryHeapBase.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/binder/MemoryHeapBase.h rename to android-headers/18/frameworks/native/include/binder/MemoryHeapBase.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/binder/Parcel.h b/android-headers/18/frameworks/native/include/binder/Parcel.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/binder/Parcel.h rename to android-headers/18/frameworks/native/include/binder/Parcel.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/binder/PermissionCache.h b/android-headers/18/frameworks/native/include/binder/PermissionCache.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/binder/PermissionCache.h rename to android-headers/18/frameworks/native/include/binder/PermissionCache.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/binder/ProcessState.h b/android-headers/18/frameworks/native/include/binder/ProcessState.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/binder/ProcessState.h rename to android-headers/18/frameworks/native/include/binder/ProcessState.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/gui/BitTube.h b/android-headers/18/frameworks/native/include/gui/BitTube.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/gui/BitTube.h rename to android-headers/18/frameworks/native/include/gui/BitTube.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/gui/BufferItemConsumer.h b/android-headers/18/frameworks/native/include/gui/BufferItemConsumer.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/gui/BufferItemConsumer.h rename to android-headers/18/frameworks/native/include/gui/BufferItemConsumer.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/gui/BufferQueue.h b/android-headers/18/frameworks/native/include/gui/BufferQueue.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/gui/BufferQueue.h rename to android-headers/18/frameworks/native/include/gui/BufferQueue.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/gui/ConsumerBase.h b/android-headers/18/frameworks/native/include/gui/ConsumerBase.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/gui/ConsumerBase.h rename to android-headers/18/frameworks/native/include/gui/ConsumerBase.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/gui/CpuConsumer.h b/android-headers/18/frameworks/native/include/gui/CpuConsumer.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/gui/CpuConsumer.h rename to android-headers/18/frameworks/native/include/gui/CpuConsumer.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/gui/DisplayEventReceiver.h b/android-headers/18/frameworks/native/include/gui/DisplayEventReceiver.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/gui/DisplayEventReceiver.h rename to android-headers/18/frameworks/native/include/gui/DisplayEventReceiver.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/gui/DummyConsumer.h b/android-headers/18/frameworks/native/include/gui/DummyConsumer.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/gui/DummyConsumer.h rename to android-headers/18/frameworks/native/include/gui/DummyConsumer.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/gui/GLConsumer.h b/android-headers/18/frameworks/native/include/gui/GLConsumer.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/gui/GLConsumer.h rename to android-headers/18/frameworks/native/include/gui/GLConsumer.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/gui/GraphicBufferAlloc.h b/android-headers/18/frameworks/native/include/gui/GraphicBufferAlloc.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/gui/GraphicBufferAlloc.h rename to android-headers/18/frameworks/native/include/gui/GraphicBufferAlloc.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/gui/GuiConfig.h b/android-headers/18/frameworks/native/include/gui/GuiConfig.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/gui/GuiConfig.h rename to android-headers/18/frameworks/native/include/gui/GuiConfig.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/gui/IDisplayEventConnection.h b/android-headers/18/frameworks/native/include/gui/IDisplayEventConnection.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/gui/IDisplayEventConnection.h rename to android-headers/18/frameworks/native/include/gui/IDisplayEventConnection.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/gui/IGraphicBufferAlloc.h b/android-headers/18/frameworks/native/include/gui/IGraphicBufferAlloc.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/gui/IGraphicBufferAlloc.h rename to android-headers/18/frameworks/native/include/gui/IGraphicBufferAlloc.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/gui/IGraphicBufferProducer.h b/android-headers/18/frameworks/native/include/gui/IGraphicBufferProducer.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/gui/IGraphicBufferProducer.h rename to android-headers/18/frameworks/native/include/gui/IGraphicBufferProducer.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/gui/ISensorEventConnection.h b/android-headers/18/frameworks/native/include/gui/ISensorEventConnection.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/gui/ISensorEventConnection.h rename to android-headers/18/frameworks/native/include/gui/ISensorEventConnection.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/gui/ISensorServer.h b/android-headers/18/frameworks/native/include/gui/ISensorServer.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/gui/ISensorServer.h rename to android-headers/18/frameworks/native/include/gui/ISensorServer.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/gui/ISurfaceComposer.h b/android-headers/18/frameworks/native/include/gui/ISurfaceComposer.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/gui/ISurfaceComposer.h rename to android-headers/18/frameworks/native/include/gui/ISurfaceComposer.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/gui/ISurfaceComposerClient.h b/android-headers/18/frameworks/native/include/gui/ISurfaceComposerClient.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/gui/ISurfaceComposerClient.h rename to android-headers/18/frameworks/native/include/gui/ISurfaceComposerClient.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/gui/Sensor.h b/android-headers/18/frameworks/native/include/gui/Sensor.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/gui/Sensor.h rename to android-headers/18/frameworks/native/include/gui/Sensor.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/gui/SensorEventQueue.h b/android-headers/18/frameworks/native/include/gui/SensorEventQueue.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/gui/SensorEventQueue.h rename to android-headers/18/frameworks/native/include/gui/SensorEventQueue.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/gui/SensorManager.h b/android-headers/18/frameworks/native/include/gui/SensorManager.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/gui/SensorManager.h rename to android-headers/18/frameworks/native/include/gui/SensorManager.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/gui/Surface.h b/android-headers/18/frameworks/native/include/gui/Surface.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/gui/Surface.h rename to android-headers/18/frameworks/native/include/gui/Surface.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/gui/SurfaceComposerClient.h b/android-headers/18/frameworks/native/include/gui/SurfaceComposerClient.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/gui/SurfaceComposerClient.h rename to android-headers/18/frameworks/native/include/gui/SurfaceComposerClient.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/gui/SurfaceControl.h b/android-headers/18/frameworks/native/include/gui/SurfaceControl.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/gui/SurfaceControl.h rename to android-headers/18/frameworks/native/include/gui/SurfaceControl.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/media/drm/DrmAPI.h b/android-headers/18/frameworks/native/include/media/drm/DrmAPI.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/media/drm/DrmAPI.h rename to android-headers/18/frameworks/native/include/media/drm/DrmAPI.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/media/editor/II420ColorConverter.h b/android-headers/18/frameworks/native/include/media/editor/II420ColorConverter.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/media/editor/II420ColorConverter.h rename to android-headers/18/frameworks/native/include/media/editor/II420ColorConverter.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/media/hardware/CryptoAPI.h b/android-headers/18/frameworks/native/include/media/hardware/CryptoAPI.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/media/hardware/CryptoAPI.h rename to android-headers/18/frameworks/native/include/media/hardware/CryptoAPI.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/media/hardware/HDCPAPI.h b/android-headers/18/frameworks/native/include/media/hardware/HDCPAPI.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/media/hardware/HDCPAPI.h rename to android-headers/18/frameworks/native/include/media/hardware/HDCPAPI.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/media/hardware/HardwareAPI.h b/android-headers/18/frameworks/native/include/media/hardware/HardwareAPI.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/media/hardware/HardwareAPI.h rename to android-headers/18/frameworks/native/include/media/hardware/HardwareAPI.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/media/hardware/MetadataBufferType.h b/android-headers/18/frameworks/native/include/media/hardware/MetadataBufferType.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/media/hardware/MetadataBufferType.h rename to android-headers/18/frameworks/native/include/media/hardware/MetadataBufferType.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/media/hardware/OMXPluginBase.h b/android-headers/18/frameworks/native/include/media/hardware/OMXPluginBase.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/media/hardware/OMXPluginBase.h rename to android-headers/18/frameworks/native/include/media/hardware/OMXPluginBase.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/media/openmax/OMX_Audio.h b/android-headers/18/frameworks/native/include/media/openmax/OMX_Audio.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/media/openmax/OMX_Audio.h rename to android-headers/18/frameworks/native/include/media/openmax/OMX_Audio.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/media/openmax/OMX_Component.h b/android-headers/18/frameworks/native/include/media/openmax/OMX_Component.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/media/openmax/OMX_Component.h rename to android-headers/18/frameworks/native/include/media/openmax/OMX_Component.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/media/openmax/OMX_ContentPipe.h b/android-headers/18/frameworks/native/include/media/openmax/OMX_ContentPipe.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/media/openmax/OMX_ContentPipe.h rename to android-headers/18/frameworks/native/include/media/openmax/OMX_ContentPipe.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/media/openmax/OMX_Core.h b/android-headers/18/frameworks/native/include/media/openmax/OMX_Core.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/media/openmax/OMX_Core.h rename to android-headers/18/frameworks/native/include/media/openmax/OMX_Core.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/media/openmax/OMX_IVCommon.h b/android-headers/18/frameworks/native/include/media/openmax/OMX_IVCommon.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/media/openmax/OMX_IVCommon.h rename to android-headers/18/frameworks/native/include/media/openmax/OMX_IVCommon.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/media/openmax/OMX_Image.h b/android-headers/18/frameworks/native/include/media/openmax/OMX_Image.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/media/openmax/OMX_Image.h rename to android-headers/18/frameworks/native/include/media/openmax/OMX_Image.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/media/openmax/OMX_Index.h b/android-headers/18/frameworks/native/include/media/openmax/OMX_Index.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/media/openmax/OMX_Index.h rename to android-headers/18/frameworks/native/include/media/openmax/OMX_Index.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/media/openmax/OMX_IndexExt.h b/android-headers/18/frameworks/native/include/media/openmax/OMX_IndexExt.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/media/openmax/OMX_IndexExt.h rename to android-headers/18/frameworks/native/include/media/openmax/OMX_IndexExt.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/media/openmax/OMX_Other.h b/android-headers/18/frameworks/native/include/media/openmax/OMX_Other.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/media/openmax/OMX_Other.h rename to android-headers/18/frameworks/native/include/media/openmax/OMX_Other.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/media/openmax/OMX_Types.h b/android-headers/18/frameworks/native/include/media/openmax/OMX_Types.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/media/openmax/OMX_Types.h rename to android-headers/18/frameworks/native/include/media/openmax/OMX_Types.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/media/openmax/OMX_Video.h b/android-headers/18/frameworks/native/include/media/openmax/OMX_Video.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/media/openmax/OMX_Video.h rename to android-headers/18/frameworks/native/include/media/openmax/OMX_Video.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/media/openmax/OMX_VideoExt.h b/android-headers/18/frameworks/native/include/media/openmax/OMX_VideoExt.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/media/openmax/OMX_VideoExt.h rename to android-headers/18/frameworks/native/include/media/openmax/OMX_VideoExt.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/ui/ANativeObjectBase.h b/android-headers/18/frameworks/native/include/ui/ANativeObjectBase.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/ui/ANativeObjectBase.h rename to android-headers/18/frameworks/native/include/ui/ANativeObjectBase.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/ui/DisplayInfo.h b/android-headers/18/frameworks/native/include/ui/DisplayInfo.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/ui/DisplayInfo.h rename to android-headers/18/frameworks/native/include/ui/DisplayInfo.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/ui/Fence.h b/android-headers/18/frameworks/native/include/ui/Fence.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/ui/Fence.h rename to android-headers/18/frameworks/native/include/ui/Fence.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/ui/FramebufferNativeWindow.h b/android-headers/18/frameworks/native/include/ui/FramebufferNativeWindow.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/ui/FramebufferNativeWindow.h rename to android-headers/18/frameworks/native/include/ui/FramebufferNativeWindow.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/ui/GraphicBuffer.h b/android-headers/18/frameworks/native/include/ui/GraphicBuffer.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/ui/GraphicBuffer.h rename to android-headers/18/frameworks/native/include/ui/GraphicBuffer.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/ui/GraphicBufferAllocator.h b/android-headers/18/frameworks/native/include/ui/GraphicBufferAllocator.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/ui/GraphicBufferAllocator.h rename to android-headers/18/frameworks/native/include/ui/GraphicBufferAllocator.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/ui/GraphicBufferMapper.h b/android-headers/18/frameworks/native/include/ui/GraphicBufferMapper.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/ui/GraphicBufferMapper.h rename to android-headers/18/frameworks/native/include/ui/GraphicBufferMapper.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/ui/PixelFormat.h b/android-headers/18/frameworks/native/include/ui/PixelFormat.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/ui/PixelFormat.h rename to android-headers/18/frameworks/native/include/ui/PixelFormat.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/ui/Point.h b/android-headers/18/frameworks/native/include/ui/Point.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/ui/Point.h rename to android-headers/18/frameworks/native/include/ui/Point.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/ui/Rect.h b/android-headers/18/frameworks/native/include/ui/Rect.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/ui/Rect.h rename to android-headers/18/frameworks/native/include/ui/Rect.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/ui/Region.h b/android-headers/18/frameworks/native/include/ui/Region.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/ui/Region.h rename to android-headers/18/frameworks/native/include/ui/Region.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/ui/UiConfig.h b/android-headers/18/frameworks/native/include/ui/UiConfig.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/ui/UiConfig.h rename to android-headers/18/frameworks/native/include/ui/UiConfig.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/utils/AndroidThreads.h b/android-headers/18/frameworks/native/include/utils/AndroidThreads.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/utils/AndroidThreads.h rename to android-headers/18/frameworks/native/include/utils/AndroidThreads.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/utils/Atomic.h b/android-headers/18/frameworks/native/include/utils/Atomic.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/utils/Atomic.h rename to android-headers/18/frameworks/native/include/utils/Atomic.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/utils/BasicHashtable.h b/android-headers/18/frameworks/native/include/utils/BasicHashtable.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/utils/BasicHashtable.h rename to android-headers/18/frameworks/native/include/utils/BasicHashtable.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/utils/BitSet.h b/android-headers/18/frameworks/native/include/utils/BitSet.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/utils/BitSet.h rename to android-headers/18/frameworks/native/include/utils/BitSet.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/utils/BlobCache.h b/android-headers/18/frameworks/native/include/utils/BlobCache.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/utils/BlobCache.h rename to android-headers/18/frameworks/native/include/utils/BlobCache.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/utils/BufferedTextOutput.h b/android-headers/18/frameworks/native/include/utils/BufferedTextOutput.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/utils/BufferedTextOutput.h rename to android-headers/18/frameworks/native/include/utils/BufferedTextOutput.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/utils/ByteOrder.h b/android-headers/18/frameworks/native/include/utils/ByteOrder.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/utils/ByteOrder.h rename to android-headers/18/frameworks/native/include/utils/ByteOrder.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/utils/CallStack.h b/android-headers/18/frameworks/native/include/utils/CallStack.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/utils/CallStack.h rename to android-headers/18/frameworks/native/include/utils/CallStack.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/utils/Compat.h b/android-headers/18/frameworks/native/include/utils/Compat.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/utils/Compat.h rename to android-headers/18/frameworks/native/include/utils/Compat.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/utils/Condition.h b/android-headers/18/frameworks/native/include/utils/Condition.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/utils/Condition.h rename to android-headers/18/frameworks/native/include/utils/Condition.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/utils/Debug.h b/android-headers/18/frameworks/native/include/utils/Debug.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/utils/Debug.h rename to android-headers/18/frameworks/native/include/utils/Debug.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/utils/Endian.h b/android-headers/18/frameworks/native/include/utils/Endian.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/utils/Endian.h rename to android-headers/18/frameworks/native/include/utils/Endian.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/utils/Errors.h b/android-headers/18/frameworks/native/include/utils/Errors.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/utils/Errors.h rename to android-headers/18/frameworks/native/include/utils/Errors.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/utils/FileMap.h b/android-headers/18/frameworks/native/include/utils/FileMap.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/utils/FileMap.h rename to android-headers/18/frameworks/native/include/utils/FileMap.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/utils/Flattenable.h b/android-headers/18/frameworks/native/include/utils/Flattenable.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/utils/Flattenable.h rename to android-headers/18/frameworks/native/include/utils/Flattenable.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/utils/Functor.h b/android-headers/18/frameworks/native/include/utils/Functor.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/utils/Functor.h rename to android-headers/18/frameworks/native/include/utils/Functor.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/utils/GenerationCache.h b/android-headers/18/frameworks/native/include/utils/GenerationCache.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/utils/GenerationCache.h rename to android-headers/18/frameworks/native/include/utils/GenerationCache.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/utils/JenkinsHash.h b/android-headers/18/frameworks/native/include/utils/JenkinsHash.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/utils/JenkinsHash.h rename to android-headers/18/frameworks/native/include/utils/JenkinsHash.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/utils/KeyedVector.h b/android-headers/18/frameworks/native/include/utils/KeyedVector.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/utils/KeyedVector.h rename to android-headers/18/frameworks/native/include/utils/KeyedVector.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/utils/LinearAllocator.h b/android-headers/18/frameworks/native/include/utils/LinearAllocator.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/utils/LinearAllocator.h rename to android-headers/18/frameworks/native/include/utils/LinearAllocator.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/utils/LinearTransform.h b/android-headers/18/frameworks/native/include/utils/LinearTransform.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/utils/LinearTransform.h rename to android-headers/18/frameworks/native/include/utils/LinearTransform.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/utils/List.h b/android-headers/18/frameworks/native/include/utils/List.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/utils/List.h rename to android-headers/18/frameworks/native/include/utils/List.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/utils/Log.h b/android-headers/18/frameworks/native/include/utils/Log.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/utils/Log.h rename to android-headers/18/frameworks/native/include/utils/Log.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/utils/Looper.h b/android-headers/18/frameworks/native/include/utils/Looper.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/utils/Looper.h rename to android-headers/18/frameworks/native/include/utils/Looper.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/utils/LruCache.h b/android-headers/18/frameworks/native/include/utils/LruCache.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/utils/LruCache.h rename to android-headers/18/frameworks/native/include/utils/LruCache.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/utils/Mutex.h b/android-headers/18/frameworks/native/include/utils/Mutex.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/utils/Mutex.h rename to android-headers/18/frameworks/native/include/utils/Mutex.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/utils/PropertyMap.h b/android-headers/18/frameworks/native/include/utils/PropertyMap.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/utils/PropertyMap.h rename to android-headers/18/frameworks/native/include/utils/PropertyMap.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/utils/RWLock.h b/android-headers/18/frameworks/native/include/utils/RWLock.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/utils/RWLock.h rename to android-headers/18/frameworks/native/include/utils/RWLock.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/utils/RefBase.h b/android-headers/18/frameworks/native/include/utils/RefBase.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/utils/RefBase.h rename to android-headers/18/frameworks/native/include/utils/RefBase.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/utils/SharedBuffer.h b/android-headers/18/frameworks/native/include/utils/SharedBuffer.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/utils/SharedBuffer.h rename to android-headers/18/frameworks/native/include/utils/SharedBuffer.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/utils/Singleton.h b/android-headers/18/frameworks/native/include/utils/Singleton.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/utils/Singleton.h rename to android-headers/18/frameworks/native/include/utils/Singleton.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/utils/SortedVector.h b/android-headers/18/frameworks/native/include/utils/SortedVector.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/utils/SortedVector.h rename to android-headers/18/frameworks/native/include/utils/SortedVector.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/utils/StopWatch.h b/android-headers/18/frameworks/native/include/utils/StopWatch.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/utils/StopWatch.h rename to android-headers/18/frameworks/native/include/utils/StopWatch.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/utils/String16.h b/android-headers/18/frameworks/native/include/utils/String16.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/utils/String16.h rename to android-headers/18/frameworks/native/include/utils/String16.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/utils/String8.h b/android-headers/18/frameworks/native/include/utils/String8.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/utils/String8.h rename to android-headers/18/frameworks/native/include/utils/String8.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/utils/StringArray.h b/android-headers/18/frameworks/native/include/utils/StringArray.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/utils/StringArray.h rename to android-headers/18/frameworks/native/include/utils/StringArray.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/utils/StrongPointer.h b/android-headers/18/frameworks/native/include/utils/StrongPointer.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/utils/StrongPointer.h rename to android-headers/18/frameworks/native/include/utils/StrongPointer.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/utils/SystemClock.h b/android-headers/18/frameworks/native/include/utils/SystemClock.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/utils/SystemClock.h rename to android-headers/18/frameworks/native/include/utils/SystemClock.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/utils/TextOutput.h b/android-headers/18/frameworks/native/include/utils/TextOutput.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/utils/TextOutput.h rename to android-headers/18/frameworks/native/include/utils/TextOutput.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/utils/Thread.h b/android-headers/18/frameworks/native/include/utils/Thread.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/utils/Thread.h rename to android-headers/18/frameworks/native/include/utils/Thread.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/utils/ThreadDefs.h b/android-headers/18/frameworks/native/include/utils/ThreadDefs.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/utils/ThreadDefs.h rename to android-headers/18/frameworks/native/include/utils/ThreadDefs.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/utils/Timers.h b/android-headers/18/frameworks/native/include/utils/Timers.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/utils/Timers.h rename to android-headers/18/frameworks/native/include/utils/Timers.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/utils/Tokenizer.h b/android-headers/18/frameworks/native/include/utils/Tokenizer.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/utils/Tokenizer.h rename to android-headers/18/frameworks/native/include/utils/Tokenizer.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/utils/Trace.h b/android-headers/18/frameworks/native/include/utils/Trace.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/utils/Trace.h rename to android-headers/18/frameworks/native/include/utils/Trace.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/utils/TypeHelpers.h b/android-headers/18/frameworks/native/include/utils/TypeHelpers.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/utils/TypeHelpers.h rename to android-headers/18/frameworks/native/include/utils/TypeHelpers.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/utils/Unicode.h b/android-headers/18/frameworks/native/include/utils/Unicode.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/utils/Unicode.h rename to android-headers/18/frameworks/native/include/utils/Unicode.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/utils/UniquePtr.h b/android-headers/18/frameworks/native/include/utils/UniquePtr.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/utils/UniquePtr.h rename to android-headers/18/frameworks/native/include/utils/UniquePtr.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/utils/Vector.h b/android-headers/18/frameworks/native/include/utils/Vector.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/utils/Vector.h rename to android-headers/18/frameworks/native/include/utils/Vector.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/utils/VectorImpl.h b/android-headers/18/frameworks/native/include/utils/VectorImpl.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/utils/VectorImpl.h rename to android-headers/18/frameworks/native/include/utils/VectorImpl.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/utils/WorkQueue.h b/android-headers/18/frameworks/native/include/utils/WorkQueue.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/utils/WorkQueue.h rename to android-headers/18/frameworks/native/include/utils/WorkQueue.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/utils/ZipFileCRO.h b/android-headers/18/frameworks/native/include/utils/ZipFileCRO.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/utils/ZipFileCRO.h rename to android-headers/18/frameworks/native/include/utils/ZipFileCRO.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/utils/ZipFileRO.h b/android-headers/18/frameworks/native/include/utils/ZipFileRO.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/utils/ZipFileRO.h rename to android-headers/18/frameworks/native/include/utils/ZipFileRO.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/utils/ZipUtils.h b/android-headers/18/frameworks/native/include/utils/ZipUtils.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/utils/ZipUtils.h rename to android-headers/18/frameworks/native/include/utils/ZipUtils.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/utils/ashmem.h b/android-headers/18/frameworks/native/include/utils/ashmem.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/utils/ashmem.h rename to android-headers/18/frameworks/native/include/utils/ashmem.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/utils/misc.h b/android-headers/18/frameworks/native/include/utils/misc.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/utils/misc.h rename to android-headers/18/frameworks/native/include/utils/misc.h diff --git a/android-headers/android-headers-jbmr2/frameworks/native/include/utils/threads.h b/android-headers/18/frameworks/native/include/utils/threads.h similarity index 100% rename from android-headers/android-headers-jbmr2/frameworks/native/include/utils/threads.h rename to android-headers/18/frameworks/native/include/utils/threads.h diff --git a/android-headers/android-headers-jbmr2/hardware/libhardware/include/hardware/audio.h b/android-headers/18/hardware/libhardware/include/hardware/audio.h similarity index 100% rename from android-headers/android-headers-jbmr2/hardware/libhardware/include/hardware/audio.h rename to android-headers/18/hardware/libhardware/include/hardware/audio.h diff --git a/android-headers/android-headers-jbmr2/hardware/libhardware/include/hardware/audio_effect.h b/android-headers/18/hardware/libhardware/include/hardware/audio_effect.h similarity index 100% rename from android-headers/android-headers-jbmr2/hardware/libhardware/include/hardware/audio_effect.h rename to android-headers/18/hardware/libhardware/include/hardware/audio_effect.h diff --git a/android-headers/android-headers-jbmr2/hardware/libhardware/include/hardware/audio_policy.h b/android-headers/18/hardware/libhardware/include/hardware/audio_policy.h similarity index 100% rename from android-headers/android-headers-jbmr2/hardware/libhardware/include/hardware/audio_policy.h rename to android-headers/18/hardware/libhardware/include/hardware/audio_policy.h diff --git a/android-headers/android-headers-jbmr2/hardware/libhardware/include/hardware/bluetooth.h b/android-headers/18/hardware/libhardware/include/hardware/bluetooth.h similarity index 100% rename from android-headers/android-headers-jbmr2/hardware/libhardware/include/hardware/bluetooth.h rename to android-headers/18/hardware/libhardware/include/hardware/bluetooth.h diff --git a/android-headers/android-headers-jbmr2/hardware/libhardware/include/hardware/bt_av.h b/android-headers/18/hardware/libhardware/include/hardware/bt_av.h similarity index 100% rename from android-headers/android-headers-jbmr2/hardware/libhardware/include/hardware/bt_av.h rename to android-headers/18/hardware/libhardware/include/hardware/bt_av.h diff --git a/android-headers/android-headers-jbmr2/hardware/libhardware/include/hardware/bt_gatt.h b/android-headers/18/hardware/libhardware/include/hardware/bt_gatt.h similarity index 100% rename from android-headers/android-headers-jbmr2/hardware/libhardware/include/hardware/bt_gatt.h rename to android-headers/18/hardware/libhardware/include/hardware/bt_gatt.h diff --git a/android-headers/android-headers-jbmr2/hardware/libhardware/include/hardware/bt_gatt_client.h b/android-headers/18/hardware/libhardware/include/hardware/bt_gatt_client.h similarity index 100% rename from android-headers/android-headers-jbmr2/hardware/libhardware/include/hardware/bt_gatt_client.h rename to android-headers/18/hardware/libhardware/include/hardware/bt_gatt_client.h diff --git a/android-headers/android-headers-jbmr2/hardware/libhardware/include/hardware/bt_gatt_server.h b/android-headers/18/hardware/libhardware/include/hardware/bt_gatt_server.h similarity index 100% rename from android-headers/android-headers-jbmr2/hardware/libhardware/include/hardware/bt_gatt_server.h rename to android-headers/18/hardware/libhardware/include/hardware/bt_gatt_server.h diff --git a/android-headers/android-headers-jbmr2/hardware/libhardware/include/hardware/bt_gatt_types.h b/android-headers/18/hardware/libhardware/include/hardware/bt_gatt_types.h similarity index 100% rename from android-headers/android-headers-jbmr2/hardware/libhardware/include/hardware/bt_gatt_types.h rename to android-headers/18/hardware/libhardware/include/hardware/bt_gatt_types.h diff --git a/android-headers/android-headers-jbmr2/hardware/libhardware/include/hardware/bt_hf.h b/android-headers/18/hardware/libhardware/include/hardware/bt_hf.h similarity index 100% rename from android-headers/android-headers-jbmr2/hardware/libhardware/include/hardware/bt_hf.h rename to android-headers/18/hardware/libhardware/include/hardware/bt_hf.h diff --git a/android-headers/android-headers-jbmr2/hardware/libhardware/include/hardware/bt_hh.h b/android-headers/18/hardware/libhardware/include/hardware/bt_hh.h similarity index 100% rename from android-headers/android-headers-jbmr2/hardware/libhardware/include/hardware/bt_hh.h rename to android-headers/18/hardware/libhardware/include/hardware/bt_hh.h diff --git a/android-headers/android-headers-jbmr2/hardware/libhardware/include/hardware/bt_hl.h b/android-headers/18/hardware/libhardware/include/hardware/bt_hl.h similarity index 100% rename from android-headers/android-headers-jbmr2/hardware/libhardware/include/hardware/bt_hl.h rename to android-headers/18/hardware/libhardware/include/hardware/bt_hl.h diff --git a/android-headers/android-headers-jbmr2/hardware/libhardware/include/hardware/bt_pan.h b/android-headers/18/hardware/libhardware/include/hardware/bt_pan.h similarity index 100% rename from android-headers/android-headers-jbmr2/hardware/libhardware/include/hardware/bt_pan.h rename to android-headers/18/hardware/libhardware/include/hardware/bt_pan.h diff --git a/android-headers/android-headers-jbmr2/hardware/libhardware/include/hardware/bt_rc.h b/android-headers/18/hardware/libhardware/include/hardware/bt_rc.h similarity index 100% rename from android-headers/android-headers-jbmr2/hardware/libhardware/include/hardware/bt_rc.h rename to android-headers/18/hardware/libhardware/include/hardware/bt_rc.h diff --git a/android-headers/android-headers-jbmr2/hardware/libhardware/include/hardware/bt_sock.h b/android-headers/18/hardware/libhardware/include/hardware/bt_sock.h similarity index 100% rename from android-headers/android-headers-jbmr2/hardware/libhardware/include/hardware/bt_sock.h rename to android-headers/18/hardware/libhardware/include/hardware/bt_sock.h diff --git a/android-headers/android-headers-jbmr2/hardware/libhardware/include/hardware/camera.h b/android-headers/18/hardware/libhardware/include/hardware/camera.h similarity index 100% rename from android-headers/android-headers-jbmr2/hardware/libhardware/include/hardware/camera.h rename to android-headers/18/hardware/libhardware/include/hardware/camera.h diff --git a/android-headers/android-headers-jbmr2/hardware/libhardware/include/hardware/camera2.h b/android-headers/18/hardware/libhardware/include/hardware/camera2.h similarity index 100% rename from android-headers/android-headers-jbmr2/hardware/libhardware/include/hardware/camera2.h rename to android-headers/18/hardware/libhardware/include/hardware/camera2.h diff --git a/android-headers/android-headers-jbmr2/hardware/libhardware/include/hardware/camera3.h b/android-headers/18/hardware/libhardware/include/hardware/camera3.h similarity index 100% rename from android-headers/android-headers-jbmr2/hardware/libhardware/include/hardware/camera3.h rename to android-headers/18/hardware/libhardware/include/hardware/camera3.h diff --git a/android-headers/android-headers-jbmr2/hardware/libhardware/include/hardware/camera_common.h b/android-headers/18/hardware/libhardware/include/hardware/camera_common.h similarity index 100% rename from android-headers/android-headers-jbmr2/hardware/libhardware/include/hardware/camera_common.h rename to android-headers/18/hardware/libhardware/include/hardware/camera_common.h diff --git a/android-headers/android-headers-jbmr2/hardware/libhardware/include/hardware/fb.h b/android-headers/18/hardware/libhardware/include/hardware/fb.h similarity index 100% rename from android-headers/android-headers-jbmr2/hardware/libhardware/include/hardware/fb.h rename to android-headers/18/hardware/libhardware/include/hardware/fb.h diff --git a/android-headers/android-headers-jbmr2/hardware/libhardware/include/hardware/gps.h b/android-headers/18/hardware/libhardware/include/hardware/gps.h similarity index 100% rename from android-headers/android-headers-jbmr2/hardware/libhardware/include/hardware/gps.h rename to android-headers/18/hardware/libhardware/include/hardware/gps.h diff --git a/android-headers/android-headers-jbmr2/hardware/libhardware/include/hardware/gralloc.h b/android-headers/18/hardware/libhardware/include/hardware/gralloc.h similarity index 100% rename from android-headers/android-headers-jbmr2/hardware/libhardware/include/hardware/gralloc.h rename to android-headers/18/hardware/libhardware/include/hardware/gralloc.h diff --git a/android-headers/android-headers-jbmr2/hardware/libhardware/include/hardware/hardware.h b/android-headers/18/hardware/libhardware/include/hardware/hardware.h similarity index 100% rename from android-headers/android-headers-jbmr2/hardware/libhardware/include/hardware/hardware.h rename to android-headers/18/hardware/libhardware/include/hardware/hardware.h diff --git a/android-headers/android-headers-jbmr2/hardware/libhardware/include/hardware/hwcomposer.h b/android-headers/18/hardware/libhardware/include/hardware/hwcomposer.h similarity index 100% rename from android-headers/android-headers-jbmr2/hardware/libhardware/include/hardware/hwcomposer.h rename to android-headers/18/hardware/libhardware/include/hardware/hwcomposer.h diff --git a/android-headers/android-headers-jbmr2/hardware/libhardware/include/hardware/hwcomposer_defs.h b/android-headers/18/hardware/libhardware/include/hardware/hwcomposer_defs.h similarity index 100% rename from android-headers/android-headers-jbmr2/hardware/libhardware/include/hardware/hwcomposer_defs.h rename to android-headers/18/hardware/libhardware/include/hardware/hwcomposer_defs.h diff --git a/android-headers/android-headers-jbmr2/hardware/libhardware/include/hardware/keymaster.h b/android-headers/18/hardware/libhardware/include/hardware/keymaster.h similarity index 100% rename from android-headers/android-headers-jbmr2/hardware/libhardware/include/hardware/keymaster.h rename to android-headers/18/hardware/libhardware/include/hardware/keymaster.h diff --git a/android-headers/android-headers-jbmr2/hardware/libhardware/include/hardware/lights.h b/android-headers/18/hardware/libhardware/include/hardware/lights.h similarity index 100% rename from android-headers/android-headers-jbmr2/hardware/libhardware/include/hardware/lights.h rename to android-headers/18/hardware/libhardware/include/hardware/lights.h diff --git a/android-headers/android-headers-jbmr2/hardware/libhardware/include/hardware/local_time_hal.h b/android-headers/18/hardware/libhardware/include/hardware/local_time_hal.h similarity index 100% rename from android-headers/android-headers-jbmr2/hardware/libhardware/include/hardware/local_time_hal.h rename to android-headers/18/hardware/libhardware/include/hardware/local_time_hal.h diff --git a/android-headers/android-headers-jbmr2/hardware/libhardware/include/hardware/nfc.h b/android-headers/18/hardware/libhardware/include/hardware/nfc.h similarity index 100% rename from android-headers/android-headers-jbmr2/hardware/libhardware/include/hardware/nfc.h rename to android-headers/18/hardware/libhardware/include/hardware/nfc.h diff --git a/android-headers/android-headers-jbmr2/hardware/libhardware/include/hardware/power.h b/android-headers/18/hardware/libhardware/include/hardware/power.h similarity index 100% rename from android-headers/android-headers-jbmr2/hardware/libhardware/include/hardware/power.h rename to android-headers/18/hardware/libhardware/include/hardware/power.h diff --git a/android-headers/android-headers-jbmr2/hardware/libhardware/include/hardware/qemu_pipe.h b/android-headers/18/hardware/libhardware/include/hardware/qemu_pipe.h similarity index 100% rename from android-headers/android-headers-jbmr2/hardware/libhardware/include/hardware/qemu_pipe.h rename to android-headers/18/hardware/libhardware/include/hardware/qemu_pipe.h diff --git a/android-headers/android-headers-jbmr2/hardware/libhardware/include/hardware/qemud.h b/android-headers/18/hardware/libhardware/include/hardware/qemud.h similarity index 100% rename from android-headers/android-headers-jbmr2/hardware/libhardware/include/hardware/qemud.h rename to android-headers/18/hardware/libhardware/include/hardware/qemud.h diff --git a/android-headers/android-headers-jbmr2/hardware/libhardware/include/hardware/sensors.h b/android-headers/18/hardware/libhardware/include/hardware/sensors.h similarity index 100% rename from android-headers/android-headers-jbmr2/hardware/libhardware/include/hardware/sensors.h rename to android-headers/18/hardware/libhardware/include/hardware/sensors.h diff --git a/android-headers/android-headers-jbmr2/system/core/include/cutils/abort_socket.h b/android-headers/18/system/core/include/cutils/abort_socket.h similarity index 100% rename from android-headers/android-headers-jbmr2/system/core/include/cutils/abort_socket.h rename to android-headers/18/system/core/include/cutils/abort_socket.h diff --git a/android-headers/android-headers-jbmr2/system/core/include/cutils/android_reboot.h b/android-headers/18/system/core/include/cutils/android_reboot.h similarity index 100% rename from android-headers/android-headers-jbmr2/system/core/include/cutils/android_reboot.h rename to android-headers/18/system/core/include/cutils/android_reboot.h diff --git a/android-headers/android-headers-jbmr2/system/core/include/cutils/aref.h b/android-headers/18/system/core/include/cutils/aref.h similarity index 100% rename from android-headers/android-headers-jbmr2/system/core/include/cutils/aref.h rename to android-headers/18/system/core/include/cutils/aref.h diff --git a/android-headers/android-headers-jbmr2/system/core/include/cutils/array.h b/android-headers/18/system/core/include/cutils/array.h similarity index 100% rename from android-headers/android-headers-jbmr2/system/core/include/cutils/array.h rename to android-headers/18/system/core/include/cutils/array.h diff --git a/android-headers/android-headers-jbmr2/system/core/include/cutils/ashmem.h b/android-headers/18/system/core/include/cutils/ashmem.h similarity index 100% rename from android-headers/android-headers-jbmr2/system/core/include/cutils/ashmem.h rename to android-headers/18/system/core/include/cutils/ashmem.h diff --git a/android-headers/android-headers-jbmr2/system/core/include/cutils/atomic-arm.h b/android-headers/18/system/core/include/cutils/atomic-arm.h similarity index 100% rename from android-headers/android-headers-jbmr2/system/core/include/cutils/atomic-arm.h rename to android-headers/18/system/core/include/cutils/atomic-arm.h diff --git a/android-headers/android-headers-jbmr2/system/core/include/cutils/atomic-inline.h b/android-headers/18/system/core/include/cutils/atomic-inline.h similarity index 100% rename from android-headers/android-headers-jbmr2/system/core/include/cutils/atomic-inline.h rename to android-headers/18/system/core/include/cutils/atomic-inline.h diff --git a/android-headers/android-headers-jbmr2/system/core/include/cutils/atomic-mips.h b/android-headers/18/system/core/include/cutils/atomic-mips.h similarity index 100% rename from android-headers/android-headers-jbmr2/system/core/include/cutils/atomic-mips.h rename to android-headers/18/system/core/include/cutils/atomic-mips.h diff --git a/android-headers/android-headers-jbmr2/system/core/include/cutils/atomic-x86.h b/android-headers/18/system/core/include/cutils/atomic-x86.h similarity index 100% rename from android-headers/android-headers-jbmr2/system/core/include/cutils/atomic-x86.h rename to android-headers/18/system/core/include/cutils/atomic-x86.h diff --git a/android-headers/android-headers-jbmr2/system/core/include/cutils/atomic.h b/android-headers/18/system/core/include/cutils/atomic.h similarity index 100% rename from android-headers/android-headers-jbmr2/system/core/include/cutils/atomic.h rename to android-headers/18/system/core/include/cutils/atomic.h diff --git a/android-headers/android-headers-jbmr2/system/core/include/cutils/bitops.h b/android-headers/18/system/core/include/cutils/bitops.h similarity index 100% rename from android-headers/android-headers-jbmr2/system/core/include/cutils/bitops.h rename to android-headers/18/system/core/include/cutils/bitops.h diff --git a/android-headers/android-headers-jbmr2/system/core/include/cutils/compiler.h b/android-headers/18/system/core/include/cutils/compiler.h similarity index 100% rename from android-headers/android-headers-jbmr2/system/core/include/cutils/compiler.h rename to android-headers/18/system/core/include/cutils/compiler.h diff --git a/android-headers/android-headers-jbmr2/system/core/include/cutils/config_utils.h b/android-headers/18/system/core/include/cutils/config_utils.h similarity index 100% rename from android-headers/android-headers-jbmr2/system/core/include/cutils/config_utils.h rename to android-headers/18/system/core/include/cutils/config_utils.h diff --git a/android-headers/android-headers-jbmr2/system/core/include/cutils/cpu_info.h b/android-headers/18/system/core/include/cutils/cpu_info.h similarity index 100% rename from android-headers/android-headers-jbmr2/system/core/include/cutils/cpu_info.h rename to android-headers/18/system/core/include/cutils/cpu_info.h diff --git a/android-headers/android-headers-jbmr2/system/core/include/cutils/debugger.h b/android-headers/18/system/core/include/cutils/debugger.h similarity index 100% rename from android-headers/android-headers-jbmr2/system/core/include/cutils/debugger.h rename to android-headers/18/system/core/include/cutils/debugger.h diff --git a/android-headers/android-headers-jbmr2/system/core/include/cutils/dir_hash.h b/android-headers/18/system/core/include/cutils/dir_hash.h similarity index 100% rename from android-headers/android-headers-jbmr2/system/core/include/cutils/dir_hash.h rename to android-headers/18/system/core/include/cutils/dir_hash.h diff --git a/android-headers/android-headers-jbmr2/system/core/include/cutils/event_tag_map.h b/android-headers/18/system/core/include/cutils/event_tag_map.h similarity index 100% rename from android-headers/android-headers-jbmr2/system/core/include/cutils/event_tag_map.h rename to android-headers/18/system/core/include/cutils/event_tag_map.h diff --git a/android-headers/android-headers-jbmr2/system/core/include/cutils/fs.h b/android-headers/18/system/core/include/cutils/fs.h similarity index 100% rename from android-headers/android-headers-jbmr2/system/core/include/cutils/fs.h rename to android-headers/18/system/core/include/cutils/fs.h diff --git a/android-headers/android-headers-jbmr2/system/core/include/cutils/hashmap.h b/android-headers/18/system/core/include/cutils/hashmap.h similarity index 100% rename from android-headers/android-headers-jbmr2/system/core/include/cutils/hashmap.h rename to android-headers/18/system/core/include/cutils/hashmap.h diff --git a/android-headers/android-headers-jbmr2/system/core/include/cutils/iosched_policy.h b/android-headers/18/system/core/include/cutils/iosched_policy.h similarity index 100% rename from android-headers/android-headers-jbmr2/system/core/include/cutils/iosched_policy.h rename to android-headers/18/system/core/include/cutils/iosched_policy.h diff --git a/android-headers/android-headers-jbmr2/system/core/include/cutils/jstring.h b/android-headers/18/system/core/include/cutils/jstring.h similarity index 100% rename from android-headers/android-headers-jbmr2/system/core/include/cutils/jstring.h rename to android-headers/18/system/core/include/cutils/jstring.h diff --git a/android-headers/android-headers-jbmr2/system/core/include/cutils/klog.h b/android-headers/18/system/core/include/cutils/klog.h similarity index 100% rename from android-headers/android-headers-jbmr2/system/core/include/cutils/klog.h rename to android-headers/18/system/core/include/cutils/klog.h diff --git a/android-headers/android-headers-jbmr2/system/core/include/cutils/list.h b/android-headers/18/system/core/include/cutils/list.h similarity index 100% rename from android-headers/android-headers-jbmr2/system/core/include/cutils/list.h rename to android-headers/18/system/core/include/cutils/list.h diff --git a/android-headers/android-headers-jbmr2/system/core/include/cutils/log.h b/android-headers/18/system/core/include/cutils/log.h similarity index 100% rename from android-headers/android-headers-jbmr2/system/core/include/cutils/log.h rename to android-headers/18/system/core/include/cutils/log.h diff --git a/android-headers/android-headers-jbmr2/system/core/include/cutils/logd.h b/android-headers/18/system/core/include/cutils/logd.h similarity index 100% rename from android-headers/android-headers-jbmr2/system/core/include/cutils/logd.h rename to android-headers/18/system/core/include/cutils/logd.h diff --git a/android-headers/android-headers-jbmr2/system/core/include/cutils/logger.h b/android-headers/18/system/core/include/cutils/logger.h similarity index 100% rename from android-headers/android-headers-jbmr2/system/core/include/cutils/logger.h rename to android-headers/18/system/core/include/cutils/logger.h diff --git a/android-headers/android-headers-jbmr2/system/core/include/cutils/logprint.h b/android-headers/18/system/core/include/cutils/logprint.h similarity index 100% rename from android-headers/android-headers-jbmr2/system/core/include/cutils/logprint.h rename to android-headers/18/system/core/include/cutils/logprint.h diff --git a/android-headers/android-headers-jbmr2/system/core/include/cutils/memory.h b/android-headers/18/system/core/include/cutils/memory.h similarity index 100% rename from android-headers/android-headers-jbmr2/system/core/include/cutils/memory.h rename to android-headers/18/system/core/include/cutils/memory.h diff --git a/android-headers/android-headers-jbmr2/system/core/include/cutils/misc.h b/android-headers/18/system/core/include/cutils/misc.h similarity index 100% rename from android-headers/android-headers-jbmr2/system/core/include/cutils/misc.h rename to android-headers/18/system/core/include/cutils/misc.h diff --git a/android-headers/android-headers-jbmr2/system/core/include/cutils/mq.h b/android-headers/18/system/core/include/cutils/mq.h similarity index 100% rename from android-headers/android-headers-jbmr2/system/core/include/cutils/mq.h rename to android-headers/18/system/core/include/cutils/mq.h diff --git a/android-headers/android-headers-jbmr2/system/core/include/cutils/multiuser.h b/android-headers/18/system/core/include/cutils/multiuser.h similarity index 100% rename from android-headers/android-headers-jbmr2/system/core/include/cutils/multiuser.h rename to android-headers/18/system/core/include/cutils/multiuser.h diff --git a/android-headers/android-headers-jbmr2/system/core/include/cutils/native_handle.h b/android-headers/18/system/core/include/cutils/native_handle.h similarity index 100% rename from android-headers/android-headers-jbmr2/system/core/include/cutils/native_handle.h rename to android-headers/18/system/core/include/cutils/native_handle.h diff --git a/android-headers/android-headers-jbmr2/system/core/include/cutils/open_memstream.h b/android-headers/18/system/core/include/cutils/open_memstream.h similarity index 100% rename from android-headers/android-headers-jbmr2/system/core/include/cutils/open_memstream.h rename to android-headers/18/system/core/include/cutils/open_memstream.h diff --git a/android-headers/android-headers-jbmr2/system/core/include/cutils/partition_utils.h b/android-headers/18/system/core/include/cutils/partition_utils.h similarity index 100% rename from android-headers/android-headers-jbmr2/system/core/include/cutils/partition_utils.h rename to android-headers/18/system/core/include/cutils/partition_utils.h diff --git a/android-headers/android-headers-jbmr2/system/core/include/cutils/process_name.h b/android-headers/18/system/core/include/cutils/process_name.h similarity index 100% rename from android-headers/android-headers-jbmr2/system/core/include/cutils/process_name.h rename to android-headers/18/system/core/include/cutils/process_name.h diff --git a/android-headers/android-headers-jbmr2/system/core/include/cutils/properties.h b/android-headers/18/system/core/include/cutils/properties.h similarity index 100% rename from android-headers/android-headers-jbmr2/system/core/include/cutils/properties.h rename to android-headers/18/system/core/include/cutils/properties.h diff --git a/android-headers/android-headers-jbmr2/system/core/include/cutils/qsort_r_compat.h b/android-headers/18/system/core/include/cutils/qsort_r_compat.h similarity index 100% rename from android-headers/android-headers-jbmr2/system/core/include/cutils/qsort_r_compat.h rename to android-headers/18/system/core/include/cutils/qsort_r_compat.h diff --git a/android-headers/android-headers-jbmr2/system/core/include/cutils/qtaguid.h b/android-headers/18/system/core/include/cutils/qtaguid.h similarity index 100% rename from android-headers/android-headers-jbmr2/system/core/include/cutils/qtaguid.h rename to android-headers/18/system/core/include/cutils/qtaguid.h diff --git a/android-headers/android-headers-jbmr2/system/core/include/cutils/record_stream.h b/android-headers/18/system/core/include/cutils/record_stream.h similarity index 100% rename from android-headers/android-headers-jbmr2/system/core/include/cutils/record_stream.h rename to android-headers/18/system/core/include/cutils/record_stream.h diff --git a/android-headers/android-headers-jbmr2/system/core/include/cutils/sched_policy.h b/android-headers/18/system/core/include/cutils/sched_policy.h similarity index 100% rename from android-headers/android-headers-jbmr2/system/core/include/cutils/sched_policy.h rename to android-headers/18/system/core/include/cutils/sched_policy.h diff --git a/android-headers/android-headers-jbmr2/system/core/include/cutils/selector.h b/android-headers/18/system/core/include/cutils/selector.h similarity index 100% rename from android-headers/android-headers-jbmr2/system/core/include/cutils/selector.h rename to android-headers/18/system/core/include/cutils/selector.h diff --git a/android-headers/android-headers-jbmr2/system/core/include/cutils/sockets.h b/android-headers/18/system/core/include/cutils/sockets.h similarity index 100% rename from android-headers/android-headers-jbmr2/system/core/include/cutils/sockets.h rename to android-headers/18/system/core/include/cutils/sockets.h diff --git a/android-headers/android-headers-jbmr2/system/core/include/cutils/str_parms.h b/android-headers/18/system/core/include/cutils/str_parms.h similarity index 100% rename from android-headers/android-headers-jbmr2/system/core/include/cutils/str_parms.h rename to android-headers/18/system/core/include/cutils/str_parms.h diff --git a/android-headers/android-headers-jbmr2/system/core/include/cutils/threads.h b/android-headers/18/system/core/include/cutils/threads.h similarity index 100% rename from android-headers/android-headers-jbmr2/system/core/include/cutils/threads.h rename to android-headers/18/system/core/include/cutils/threads.h diff --git a/android-headers/android-headers-jbmr2/system/core/include/cutils/trace.h b/android-headers/18/system/core/include/cutils/trace.h similarity index 100% rename from android-headers/android-headers-jbmr2/system/core/include/cutils/trace.h rename to android-headers/18/system/core/include/cutils/trace.h diff --git a/android-headers/android-headers-jbmr2/system/core/include/cutils/tztime.h b/android-headers/18/system/core/include/cutils/tztime.h similarity index 100% rename from android-headers/android-headers-jbmr2/system/core/include/cutils/tztime.h rename to android-headers/18/system/core/include/cutils/tztime.h diff --git a/android-headers/android-headers-jbmr2/system/core/include/cutils/uevent.h b/android-headers/18/system/core/include/cutils/uevent.h similarity index 100% rename from android-headers/android-headers-jbmr2/system/core/include/cutils/uevent.h rename to android-headers/18/system/core/include/cutils/uevent.h diff --git a/android-headers/android-headers-jbmr2/system/core/include/cutils/uio.h b/android-headers/18/system/core/include/cutils/uio.h similarity index 100% rename from android-headers/android-headers-jbmr2/system/core/include/cutils/uio.h rename to android-headers/18/system/core/include/cutils/uio.h diff --git a/android-headers/android-headers-jbmr2/system/core/include/cutils/zygote.h b/android-headers/18/system/core/include/cutils/zygote.h similarity index 100% rename from android-headers/android-headers-jbmr2/system/core/include/cutils/zygote.h rename to android-headers/18/system/core/include/cutils/zygote.h diff --git a/android-headers/android-headers-jbmr2/system/core/include/sync/sw_sync.h b/android-headers/18/system/core/include/sync/sw_sync.h similarity index 100% rename from android-headers/android-headers-jbmr2/system/core/include/sync/sw_sync.h rename to android-headers/18/system/core/include/sync/sw_sync.h diff --git a/android-headers/android-headers-jbmr2/system/core/include/sync/sync.h b/android-headers/18/system/core/include/sync/sync.h similarity index 100% rename from android-headers/android-headers-jbmr2/system/core/include/sync/sync.h rename to android-headers/18/system/core/include/sync/sync.h diff --git a/android-headers/android-headers-jbmr2/system/core/include/system/audio.h b/android-headers/18/system/core/include/system/audio.h similarity index 100% rename from android-headers/android-headers-jbmr2/system/core/include/system/audio.h rename to android-headers/18/system/core/include/system/audio.h diff --git a/android-headers/android-headers-jbmr2/system/core/include/system/audio_policy.h b/android-headers/18/system/core/include/system/audio_policy.h similarity index 100% rename from android-headers/android-headers-jbmr2/system/core/include/system/audio_policy.h rename to android-headers/18/system/core/include/system/audio_policy.h diff --git a/android-headers/android-headers-jbmr2/system/core/include/system/camera.h b/android-headers/18/system/core/include/system/camera.h similarity index 100% rename from android-headers/android-headers-jbmr2/system/core/include/system/camera.h rename to android-headers/18/system/core/include/system/camera.h diff --git a/android-headers/android-headers-jbmr2/system/core/include/system/graphics.h b/android-headers/18/system/core/include/system/graphics.h similarity index 100% rename from android-headers/android-headers-jbmr2/system/core/include/system/graphics.h rename to android-headers/18/system/core/include/system/graphics.h diff --git a/android-headers/android-headers-jbmr2/system/core/include/system/window.h b/android-headers/18/system/core/include/system/window.h similarity index 100% rename from android-headers/android-headers-jbmr2/system/core/include/system/window.h rename to android-headers/18/system/core/include/system/window.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/AudioBufferProvider.h b/android-headers/19/frameworks/av/include/media/AudioBufferProvider.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/AudioBufferProvider.h rename to android-headers/19/frameworks/av/include/media/AudioBufferProvider.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/AudioEffect.h b/android-headers/19/frameworks/av/include/media/AudioEffect.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/AudioEffect.h rename to android-headers/19/frameworks/av/include/media/AudioEffect.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/AudioParameter.h b/android-headers/19/frameworks/av/include/media/AudioParameter.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/AudioParameter.h rename to android-headers/19/frameworks/av/include/media/AudioParameter.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/AudioRecord.h b/android-headers/19/frameworks/av/include/media/AudioRecord.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/AudioRecord.h rename to android-headers/19/frameworks/av/include/media/AudioRecord.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/AudioSystem.h b/android-headers/19/frameworks/av/include/media/AudioSystem.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/AudioSystem.h rename to android-headers/19/frameworks/av/include/media/AudioSystem.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/AudioTimestamp.h b/android-headers/19/frameworks/av/include/media/AudioTimestamp.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/AudioTimestamp.h rename to android-headers/19/frameworks/av/include/media/AudioTimestamp.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/AudioTrack.h b/android-headers/19/frameworks/av/include/media/AudioTrack.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/AudioTrack.h rename to android-headers/19/frameworks/av/include/media/AudioTrack.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/EffectsFactoryApi.h b/android-headers/19/frameworks/av/include/media/EffectsFactoryApi.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/EffectsFactoryApi.h rename to android-headers/19/frameworks/av/include/media/EffectsFactoryApi.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/ExtendedAudioBufferProvider.h b/android-headers/19/frameworks/av/include/media/ExtendedAudioBufferProvider.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/ExtendedAudioBufferProvider.h rename to android-headers/19/frameworks/av/include/media/ExtendedAudioBufferProvider.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/IAudioFlinger.h b/android-headers/19/frameworks/av/include/media/IAudioFlinger.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/IAudioFlinger.h rename to android-headers/19/frameworks/av/include/media/IAudioFlinger.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/IAudioFlingerClient.h b/android-headers/19/frameworks/av/include/media/IAudioFlingerClient.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/IAudioFlingerClient.h rename to android-headers/19/frameworks/av/include/media/IAudioFlingerClient.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/IAudioPolicyService.h b/android-headers/19/frameworks/av/include/media/IAudioPolicyService.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/IAudioPolicyService.h rename to android-headers/19/frameworks/av/include/media/IAudioPolicyService.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/IAudioRecord.h b/android-headers/19/frameworks/av/include/media/IAudioRecord.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/IAudioRecord.h rename to android-headers/19/frameworks/av/include/media/IAudioRecord.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/IAudioTrack.h b/android-headers/19/frameworks/av/include/media/IAudioTrack.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/IAudioTrack.h rename to android-headers/19/frameworks/av/include/media/IAudioTrack.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/ICrypto.h b/android-headers/19/frameworks/av/include/media/ICrypto.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/ICrypto.h rename to android-headers/19/frameworks/av/include/media/ICrypto.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/IDrm.h b/android-headers/19/frameworks/av/include/media/IDrm.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/IDrm.h rename to android-headers/19/frameworks/av/include/media/IDrm.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/IDrmClient.h b/android-headers/19/frameworks/av/include/media/IDrmClient.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/IDrmClient.h rename to android-headers/19/frameworks/av/include/media/IDrmClient.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/IEffect.h b/android-headers/19/frameworks/av/include/media/IEffect.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/IEffect.h rename to android-headers/19/frameworks/av/include/media/IEffect.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/IEffectClient.h b/android-headers/19/frameworks/av/include/media/IEffectClient.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/IEffectClient.h rename to android-headers/19/frameworks/av/include/media/IEffectClient.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/IHDCP.h b/android-headers/19/frameworks/av/include/media/IHDCP.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/IHDCP.h rename to android-headers/19/frameworks/av/include/media/IHDCP.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/IMediaDeathNotifier.h b/android-headers/19/frameworks/av/include/media/IMediaDeathNotifier.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/IMediaDeathNotifier.h rename to android-headers/19/frameworks/av/include/media/IMediaDeathNotifier.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/IMediaLogService.h b/android-headers/19/frameworks/av/include/media/IMediaLogService.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/IMediaLogService.h rename to android-headers/19/frameworks/av/include/media/IMediaLogService.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/IMediaMetadataRetriever.h b/android-headers/19/frameworks/av/include/media/IMediaMetadataRetriever.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/IMediaMetadataRetriever.h rename to android-headers/19/frameworks/av/include/media/IMediaMetadataRetriever.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/IMediaPlayer.h b/android-headers/19/frameworks/av/include/media/IMediaPlayer.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/IMediaPlayer.h rename to android-headers/19/frameworks/av/include/media/IMediaPlayer.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/IMediaPlayerClient.h b/android-headers/19/frameworks/av/include/media/IMediaPlayerClient.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/IMediaPlayerClient.h rename to android-headers/19/frameworks/av/include/media/IMediaPlayerClient.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/IMediaPlayerService.h b/android-headers/19/frameworks/av/include/media/IMediaPlayerService.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/IMediaPlayerService.h rename to android-headers/19/frameworks/av/include/media/IMediaPlayerService.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/IMediaRecorder.h b/android-headers/19/frameworks/av/include/media/IMediaRecorder.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/IMediaRecorder.h rename to android-headers/19/frameworks/av/include/media/IMediaRecorder.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/IMediaRecorderClient.h b/android-headers/19/frameworks/av/include/media/IMediaRecorderClient.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/IMediaRecorderClient.h rename to android-headers/19/frameworks/av/include/media/IMediaRecorderClient.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/IOMX.h b/android-headers/19/frameworks/av/include/media/IOMX.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/IOMX.h rename to android-headers/19/frameworks/av/include/media/IOMX.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/IRemoteDisplay.h b/android-headers/19/frameworks/av/include/media/IRemoteDisplay.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/IRemoteDisplay.h rename to android-headers/19/frameworks/av/include/media/IRemoteDisplay.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/IRemoteDisplayClient.h b/android-headers/19/frameworks/av/include/media/IRemoteDisplayClient.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/IRemoteDisplayClient.h rename to android-headers/19/frameworks/av/include/media/IRemoteDisplayClient.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/IStreamSource.h b/android-headers/19/frameworks/av/include/media/IStreamSource.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/IStreamSource.h rename to android-headers/19/frameworks/av/include/media/IStreamSource.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/JetPlayer.h b/android-headers/19/frameworks/av/include/media/JetPlayer.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/JetPlayer.h rename to android-headers/19/frameworks/av/include/media/JetPlayer.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/MediaMetadataRetrieverInterface.h b/android-headers/19/frameworks/av/include/media/MediaMetadataRetrieverInterface.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/MediaMetadataRetrieverInterface.h rename to android-headers/19/frameworks/av/include/media/MediaMetadataRetrieverInterface.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/MediaPlayerInterface.h b/android-headers/19/frameworks/av/include/media/MediaPlayerInterface.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/MediaPlayerInterface.h rename to android-headers/19/frameworks/av/include/media/MediaPlayerInterface.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/MediaProfiles.h b/android-headers/19/frameworks/av/include/media/MediaProfiles.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/MediaProfiles.h rename to android-headers/19/frameworks/av/include/media/MediaProfiles.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/MediaRecorderBase.h b/android-headers/19/frameworks/av/include/media/MediaRecorderBase.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/MediaRecorderBase.h rename to android-headers/19/frameworks/av/include/media/MediaRecorderBase.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/MemoryLeakTrackUtil.h b/android-headers/19/frameworks/av/include/media/MemoryLeakTrackUtil.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/MemoryLeakTrackUtil.h rename to android-headers/19/frameworks/av/include/media/MemoryLeakTrackUtil.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/Metadata.h b/android-headers/19/frameworks/av/include/media/Metadata.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/Metadata.h rename to android-headers/19/frameworks/av/include/media/Metadata.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/SingleStateQueue.h b/android-headers/19/frameworks/av/include/media/SingleStateQueue.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/SingleStateQueue.h rename to android-headers/19/frameworks/av/include/media/SingleStateQueue.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/SoundPool.h b/android-headers/19/frameworks/av/include/media/SoundPool.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/SoundPool.h rename to android-headers/19/frameworks/av/include/media/SoundPool.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/ToneGenerator.h b/android-headers/19/frameworks/av/include/media/ToneGenerator.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/ToneGenerator.h rename to android-headers/19/frameworks/av/include/media/ToneGenerator.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/Visualizer.h b/android-headers/19/frameworks/av/include/media/Visualizer.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/Visualizer.h rename to android-headers/19/frameworks/av/include/media/Visualizer.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/mediametadataretriever.h b/android-headers/19/frameworks/av/include/media/mediametadataretriever.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/mediametadataretriever.h rename to android-headers/19/frameworks/av/include/media/mediametadataretriever.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/mediaplayer.h b/android-headers/19/frameworks/av/include/media/mediaplayer.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/mediaplayer.h rename to android-headers/19/frameworks/av/include/media/mediaplayer.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/mediarecorder.h b/android-headers/19/frameworks/av/include/media/mediarecorder.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/mediarecorder.h rename to android-headers/19/frameworks/av/include/media/mediarecorder.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/mediascanner.h b/android-headers/19/frameworks/av/include/media/mediascanner.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/mediascanner.h rename to android-headers/19/frameworks/av/include/media/mediascanner.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/nbaio/AudioBufferProviderSource.h b/android-headers/19/frameworks/av/include/media/nbaio/AudioBufferProviderSource.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/nbaio/AudioBufferProviderSource.h rename to android-headers/19/frameworks/av/include/media/nbaio/AudioBufferProviderSource.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/nbaio/AudioStreamInSource.h b/android-headers/19/frameworks/av/include/media/nbaio/AudioStreamInSource.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/nbaio/AudioStreamInSource.h rename to android-headers/19/frameworks/av/include/media/nbaio/AudioStreamInSource.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/nbaio/AudioStreamOutSink.h b/android-headers/19/frameworks/av/include/media/nbaio/AudioStreamOutSink.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/nbaio/AudioStreamOutSink.h rename to android-headers/19/frameworks/av/include/media/nbaio/AudioStreamOutSink.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/nbaio/LibsndfileSink.h b/android-headers/19/frameworks/av/include/media/nbaio/LibsndfileSink.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/nbaio/LibsndfileSink.h rename to android-headers/19/frameworks/av/include/media/nbaio/LibsndfileSink.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/nbaio/LibsndfileSource.h b/android-headers/19/frameworks/av/include/media/nbaio/LibsndfileSource.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/nbaio/LibsndfileSource.h rename to android-headers/19/frameworks/av/include/media/nbaio/LibsndfileSource.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/nbaio/MonoPipe.h b/android-headers/19/frameworks/av/include/media/nbaio/MonoPipe.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/nbaio/MonoPipe.h rename to android-headers/19/frameworks/av/include/media/nbaio/MonoPipe.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/nbaio/MonoPipeReader.h b/android-headers/19/frameworks/av/include/media/nbaio/MonoPipeReader.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/nbaio/MonoPipeReader.h rename to android-headers/19/frameworks/av/include/media/nbaio/MonoPipeReader.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/nbaio/NBAIO.h b/android-headers/19/frameworks/av/include/media/nbaio/NBAIO.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/nbaio/NBAIO.h rename to android-headers/19/frameworks/av/include/media/nbaio/NBAIO.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/nbaio/NBLog.h b/android-headers/19/frameworks/av/include/media/nbaio/NBLog.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/nbaio/NBLog.h rename to android-headers/19/frameworks/av/include/media/nbaio/NBLog.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/nbaio/Pipe.h b/android-headers/19/frameworks/av/include/media/nbaio/Pipe.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/nbaio/Pipe.h rename to android-headers/19/frameworks/av/include/media/nbaio/Pipe.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/nbaio/PipeReader.h b/android-headers/19/frameworks/av/include/media/nbaio/PipeReader.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/nbaio/PipeReader.h rename to android-headers/19/frameworks/av/include/media/nbaio/PipeReader.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/nbaio/SourceAudioBufferProvider.h b/android-headers/19/frameworks/av/include/media/nbaio/SourceAudioBufferProvider.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/nbaio/SourceAudioBufferProvider.h rename to android-headers/19/frameworks/av/include/media/nbaio/SourceAudioBufferProvider.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/nbaio/roundup.h b/android-headers/19/frameworks/av/include/media/nbaio/roundup.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/nbaio/roundup.h rename to android-headers/19/frameworks/av/include/media/nbaio/roundup.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/stagefright/AACWriter.h b/android-headers/19/frameworks/av/include/media/stagefright/AACWriter.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/stagefright/AACWriter.h rename to android-headers/19/frameworks/av/include/media/stagefright/AACWriter.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/stagefright/ACodec.h b/android-headers/19/frameworks/av/include/media/stagefright/ACodec.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/stagefright/ACodec.h rename to android-headers/19/frameworks/av/include/media/stagefright/ACodec.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/stagefright/AMRWriter.h b/android-headers/19/frameworks/av/include/media/stagefright/AMRWriter.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/stagefright/AMRWriter.h rename to android-headers/19/frameworks/av/include/media/stagefright/AMRWriter.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/stagefright/AudioPlayer.h b/android-headers/19/frameworks/av/include/media/stagefright/AudioPlayer.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/stagefright/AudioPlayer.h rename to android-headers/19/frameworks/av/include/media/stagefright/AudioPlayer.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/stagefright/AudioSource.h b/android-headers/19/frameworks/av/include/media/stagefright/AudioSource.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/stagefright/AudioSource.h rename to android-headers/19/frameworks/av/include/media/stagefright/AudioSource.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/stagefright/BufferProducerWrapper.h b/android-headers/19/frameworks/av/include/media/stagefright/BufferProducerWrapper.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/stagefright/BufferProducerWrapper.h rename to android-headers/19/frameworks/av/include/media/stagefright/BufferProducerWrapper.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/stagefright/CameraSource.h b/android-headers/19/frameworks/av/include/media/stagefright/CameraSource.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/stagefright/CameraSource.h rename to android-headers/19/frameworks/av/include/media/stagefright/CameraSource.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/stagefright/CameraSourceTimeLapse.h b/android-headers/19/frameworks/av/include/media/stagefright/CameraSourceTimeLapse.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/stagefright/CameraSourceTimeLapse.h rename to android-headers/19/frameworks/av/include/media/stagefright/CameraSourceTimeLapse.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/stagefright/ColorConverter.h b/android-headers/19/frameworks/av/include/media/stagefright/ColorConverter.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/stagefright/ColorConverter.h rename to android-headers/19/frameworks/av/include/media/stagefright/ColorConverter.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/stagefright/DataSource.h b/android-headers/19/frameworks/av/include/media/stagefright/DataSource.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/stagefright/DataSource.h rename to android-headers/19/frameworks/av/include/media/stagefright/DataSource.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/stagefright/FileSource.h b/android-headers/19/frameworks/av/include/media/stagefright/FileSource.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/stagefright/FileSource.h rename to android-headers/19/frameworks/av/include/media/stagefright/FileSource.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/stagefright/JPEGSource.h b/android-headers/19/frameworks/av/include/media/stagefright/JPEGSource.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/stagefright/JPEGSource.h rename to android-headers/19/frameworks/av/include/media/stagefright/JPEGSource.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/stagefright/MPEG2TSWriter.h b/android-headers/19/frameworks/av/include/media/stagefright/MPEG2TSWriter.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/stagefright/MPEG2TSWriter.h rename to android-headers/19/frameworks/av/include/media/stagefright/MPEG2TSWriter.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/stagefright/MPEG4Writer.h b/android-headers/19/frameworks/av/include/media/stagefright/MPEG4Writer.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/stagefright/MPEG4Writer.h rename to android-headers/19/frameworks/av/include/media/stagefright/MPEG4Writer.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/stagefright/MediaAdapter.h b/android-headers/19/frameworks/av/include/media/stagefright/MediaAdapter.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/stagefright/MediaAdapter.h rename to android-headers/19/frameworks/av/include/media/stagefright/MediaAdapter.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/stagefright/MediaBuffer.h b/android-headers/19/frameworks/av/include/media/stagefright/MediaBuffer.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/stagefright/MediaBuffer.h rename to android-headers/19/frameworks/av/include/media/stagefright/MediaBuffer.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/stagefright/MediaBufferGroup.h b/android-headers/19/frameworks/av/include/media/stagefright/MediaBufferGroup.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/stagefright/MediaBufferGroup.h rename to android-headers/19/frameworks/av/include/media/stagefright/MediaBufferGroup.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/stagefright/MediaCodec.h b/android-headers/19/frameworks/av/include/media/stagefright/MediaCodec.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/stagefright/MediaCodec.h rename to android-headers/19/frameworks/av/include/media/stagefright/MediaCodec.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/stagefright/MediaCodecList.h b/android-headers/19/frameworks/av/include/media/stagefright/MediaCodecList.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/stagefright/MediaCodecList.h rename to android-headers/19/frameworks/av/include/media/stagefright/MediaCodecList.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/stagefright/MediaDefs.h b/android-headers/19/frameworks/av/include/media/stagefright/MediaDefs.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/stagefright/MediaDefs.h rename to android-headers/19/frameworks/av/include/media/stagefright/MediaDefs.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/stagefright/MediaErrors.h b/android-headers/19/frameworks/av/include/media/stagefright/MediaErrors.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/stagefright/MediaErrors.h rename to android-headers/19/frameworks/av/include/media/stagefright/MediaErrors.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/stagefright/MediaExtractor.h b/android-headers/19/frameworks/av/include/media/stagefright/MediaExtractor.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/stagefright/MediaExtractor.h rename to android-headers/19/frameworks/av/include/media/stagefright/MediaExtractor.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/stagefright/MediaMuxer.h b/android-headers/19/frameworks/av/include/media/stagefright/MediaMuxer.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/stagefright/MediaMuxer.h rename to android-headers/19/frameworks/av/include/media/stagefright/MediaMuxer.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/stagefright/MediaSource.h b/android-headers/19/frameworks/av/include/media/stagefright/MediaSource.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/stagefright/MediaSource.h rename to android-headers/19/frameworks/av/include/media/stagefright/MediaSource.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/stagefright/MediaWriter.h b/android-headers/19/frameworks/av/include/media/stagefright/MediaWriter.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/stagefright/MediaWriter.h rename to android-headers/19/frameworks/av/include/media/stagefright/MediaWriter.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/stagefright/MetaData.h b/android-headers/19/frameworks/av/include/media/stagefright/MetaData.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/stagefright/MetaData.h rename to android-headers/19/frameworks/av/include/media/stagefright/MetaData.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/stagefright/NativeWindowWrapper.h b/android-headers/19/frameworks/av/include/media/stagefright/NativeWindowWrapper.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/stagefright/NativeWindowWrapper.h rename to android-headers/19/frameworks/av/include/media/stagefright/NativeWindowWrapper.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/stagefright/NuMediaExtractor.h b/android-headers/19/frameworks/av/include/media/stagefright/NuMediaExtractor.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/stagefright/NuMediaExtractor.h rename to android-headers/19/frameworks/av/include/media/stagefright/NuMediaExtractor.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/stagefright/OMXClient.h b/android-headers/19/frameworks/av/include/media/stagefright/OMXClient.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/stagefright/OMXClient.h rename to android-headers/19/frameworks/av/include/media/stagefright/OMXClient.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/stagefright/OMXCodec.h b/android-headers/19/frameworks/av/include/media/stagefright/OMXCodec.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/stagefright/OMXCodec.h rename to android-headers/19/frameworks/av/include/media/stagefright/OMXCodec.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/stagefright/SkipCutBuffer.h b/android-headers/19/frameworks/av/include/media/stagefright/SkipCutBuffer.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/stagefright/SkipCutBuffer.h rename to android-headers/19/frameworks/av/include/media/stagefright/SkipCutBuffer.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/stagefright/StagefrightMediaScanner.h b/android-headers/19/frameworks/av/include/media/stagefright/StagefrightMediaScanner.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/stagefright/StagefrightMediaScanner.h rename to android-headers/19/frameworks/av/include/media/stagefright/StagefrightMediaScanner.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/stagefright/SurfaceMediaSource.h b/android-headers/19/frameworks/av/include/media/stagefright/SurfaceMediaSource.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/stagefright/SurfaceMediaSource.h rename to android-headers/19/frameworks/av/include/media/stagefright/SurfaceMediaSource.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/stagefright/TimeSource.h b/android-headers/19/frameworks/av/include/media/stagefright/TimeSource.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/stagefright/TimeSource.h rename to android-headers/19/frameworks/av/include/media/stagefright/TimeSource.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/stagefright/Utils.h b/android-headers/19/frameworks/av/include/media/stagefright/Utils.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/stagefright/Utils.h rename to android-headers/19/frameworks/av/include/media/stagefright/Utils.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/stagefright/YUVCanvas.h b/android-headers/19/frameworks/av/include/media/stagefright/YUVCanvas.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/stagefright/YUVCanvas.h rename to android-headers/19/frameworks/av/include/media/stagefright/YUVCanvas.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/stagefright/YUVImage.h b/android-headers/19/frameworks/av/include/media/stagefright/YUVImage.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/stagefright/YUVImage.h rename to android-headers/19/frameworks/av/include/media/stagefright/YUVImage.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/stagefright/foundation/AAtomizer.h b/android-headers/19/frameworks/av/include/media/stagefright/foundation/AAtomizer.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/stagefright/foundation/AAtomizer.h rename to android-headers/19/frameworks/av/include/media/stagefright/foundation/AAtomizer.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/stagefright/foundation/ABase.h b/android-headers/19/frameworks/av/include/media/stagefright/foundation/ABase.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/stagefright/foundation/ABase.h rename to android-headers/19/frameworks/av/include/media/stagefright/foundation/ABase.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/stagefright/foundation/ABitReader.h b/android-headers/19/frameworks/av/include/media/stagefright/foundation/ABitReader.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/stagefright/foundation/ABitReader.h rename to android-headers/19/frameworks/av/include/media/stagefright/foundation/ABitReader.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/stagefright/foundation/ABuffer.h b/android-headers/19/frameworks/av/include/media/stagefright/foundation/ABuffer.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/stagefright/foundation/ABuffer.h rename to android-headers/19/frameworks/av/include/media/stagefright/foundation/ABuffer.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/stagefright/foundation/ADebug.h b/android-headers/19/frameworks/av/include/media/stagefright/foundation/ADebug.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/stagefright/foundation/ADebug.h rename to android-headers/19/frameworks/av/include/media/stagefright/foundation/ADebug.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/stagefright/foundation/AHandler.h b/android-headers/19/frameworks/av/include/media/stagefright/foundation/AHandler.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/stagefright/foundation/AHandler.h rename to android-headers/19/frameworks/av/include/media/stagefright/foundation/AHandler.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/stagefright/foundation/AHandlerReflector.h b/android-headers/19/frameworks/av/include/media/stagefright/foundation/AHandlerReflector.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/stagefright/foundation/AHandlerReflector.h rename to android-headers/19/frameworks/av/include/media/stagefright/foundation/AHandlerReflector.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/stagefright/foundation/AHierarchicalStateMachine.h b/android-headers/19/frameworks/av/include/media/stagefright/foundation/AHierarchicalStateMachine.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/stagefright/foundation/AHierarchicalStateMachine.h rename to android-headers/19/frameworks/av/include/media/stagefright/foundation/AHierarchicalStateMachine.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/stagefright/foundation/ALooper.h b/android-headers/19/frameworks/av/include/media/stagefright/foundation/ALooper.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/stagefright/foundation/ALooper.h rename to android-headers/19/frameworks/av/include/media/stagefright/foundation/ALooper.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/stagefright/foundation/ALooperRoster.h b/android-headers/19/frameworks/av/include/media/stagefright/foundation/ALooperRoster.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/stagefright/foundation/ALooperRoster.h rename to android-headers/19/frameworks/av/include/media/stagefright/foundation/ALooperRoster.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/stagefright/foundation/AMessage.h b/android-headers/19/frameworks/av/include/media/stagefright/foundation/AMessage.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/stagefright/foundation/AMessage.h rename to android-headers/19/frameworks/av/include/media/stagefright/foundation/AMessage.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/stagefright/foundation/ANetworkSession.h b/android-headers/19/frameworks/av/include/media/stagefright/foundation/ANetworkSession.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/stagefright/foundation/ANetworkSession.h rename to android-headers/19/frameworks/av/include/media/stagefright/foundation/ANetworkSession.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/stagefright/foundation/AString.h b/android-headers/19/frameworks/av/include/media/stagefright/foundation/AString.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/stagefright/foundation/AString.h rename to android-headers/19/frameworks/av/include/media/stagefright/foundation/AString.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/stagefright/foundation/ParsedMessage.h b/android-headers/19/frameworks/av/include/media/stagefright/foundation/ParsedMessage.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/stagefright/foundation/ParsedMessage.h rename to android-headers/19/frameworks/av/include/media/stagefright/foundation/ParsedMessage.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/stagefright/foundation/base64.h b/android-headers/19/frameworks/av/include/media/stagefright/foundation/base64.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/stagefright/foundation/base64.h rename to android-headers/19/frameworks/av/include/media/stagefright/foundation/base64.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/stagefright/foundation/hexdump.h b/android-headers/19/frameworks/av/include/media/stagefright/foundation/hexdump.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/stagefright/foundation/hexdump.h rename to android-headers/19/frameworks/av/include/media/stagefright/foundation/hexdump.h diff --git a/android-headers/android-headers-kk/frameworks/av/include/media/stagefright/timedtext/TimedTextDriver.h b/android-headers/19/frameworks/av/include/media/stagefright/timedtext/TimedTextDriver.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/av/include/media/stagefright/timedtext/TimedTextDriver.h rename to android-headers/19/frameworks/av/include/media/stagefright/timedtext/TimedTextDriver.h diff --git a/android-headers/android-headers-kk/frameworks/native/include/binder/AppOpsManager.h b/android-headers/19/frameworks/native/include/binder/AppOpsManager.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/native/include/binder/AppOpsManager.h rename to android-headers/19/frameworks/native/include/binder/AppOpsManager.h diff --git a/android-headers/android-headers-kk/frameworks/native/include/binder/Binder.h b/android-headers/19/frameworks/native/include/binder/Binder.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/native/include/binder/Binder.h rename to android-headers/19/frameworks/native/include/binder/Binder.h diff --git a/android-headers/android-headers-kk/frameworks/native/include/binder/BinderService.h b/android-headers/19/frameworks/native/include/binder/BinderService.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/native/include/binder/BinderService.h rename to android-headers/19/frameworks/native/include/binder/BinderService.h diff --git a/android-headers/android-headers-kk/frameworks/native/include/binder/BpBinder.h b/android-headers/19/frameworks/native/include/binder/BpBinder.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/native/include/binder/BpBinder.h rename to android-headers/19/frameworks/native/include/binder/BpBinder.h diff --git a/android-headers/android-headers-kk/frameworks/native/include/binder/BufferedTextOutput.h b/android-headers/19/frameworks/native/include/binder/BufferedTextOutput.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/native/include/binder/BufferedTextOutput.h rename to android-headers/19/frameworks/native/include/binder/BufferedTextOutput.h diff --git a/android-headers/android-headers-kk/frameworks/native/include/binder/Debug.h b/android-headers/19/frameworks/native/include/binder/Debug.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/native/include/binder/Debug.h rename to android-headers/19/frameworks/native/include/binder/Debug.h diff --git a/android-headers/android-headers-kk/frameworks/native/include/binder/IAppOpsCallback.h b/android-headers/19/frameworks/native/include/binder/IAppOpsCallback.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/native/include/binder/IAppOpsCallback.h rename to android-headers/19/frameworks/native/include/binder/IAppOpsCallback.h diff --git a/android-headers/android-headers-kk/frameworks/native/include/binder/IAppOpsService.h b/android-headers/19/frameworks/native/include/binder/IAppOpsService.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/native/include/binder/IAppOpsService.h rename to android-headers/19/frameworks/native/include/binder/IAppOpsService.h diff --git a/android-headers/android-headers-kk/frameworks/native/include/binder/IBinder.h b/android-headers/19/frameworks/native/include/binder/IBinder.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/native/include/binder/IBinder.h rename to android-headers/19/frameworks/native/include/binder/IBinder.h diff --git a/android-headers/android-headers-kk/frameworks/native/include/binder/IInterface.h b/android-headers/19/frameworks/native/include/binder/IInterface.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/native/include/binder/IInterface.h rename to android-headers/19/frameworks/native/include/binder/IInterface.h diff --git a/android-headers/android-headers-kk/frameworks/native/include/binder/IMemory.h b/android-headers/19/frameworks/native/include/binder/IMemory.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/native/include/binder/IMemory.h rename to android-headers/19/frameworks/native/include/binder/IMemory.h diff --git a/android-headers/android-headers-kk/frameworks/native/include/binder/IPCThreadState.h b/android-headers/19/frameworks/native/include/binder/IPCThreadState.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/native/include/binder/IPCThreadState.h rename to android-headers/19/frameworks/native/include/binder/IPCThreadState.h diff --git a/android-headers/android-headers-kk/frameworks/native/include/binder/IPermissionController.h b/android-headers/19/frameworks/native/include/binder/IPermissionController.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/native/include/binder/IPermissionController.h rename to android-headers/19/frameworks/native/include/binder/IPermissionController.h diff --git a/android-headers/android-headers-kk/frameworks/native/include/binder/IServiceManager.h b/android-headers/19/frameworks/native/include/binder/IServiceManager.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/native/include/binder/IServiceManager.h rename to android-headers/19/frameworks/native/include/binder/IServiceManager.h diff --git a/android-headers/android-headers-kk/frameworks/native/include/binder/MemoryBase.h b/android-headers/19/frameworks/native/include/binder/MemoryBase.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/native/include/binder/MemoryBase.h rename to android-headers/19/frameworks/native/include/binder/MemoryBase.h diff --git a/android-headers/android-headers-kk/frameworks/native/include/binder/MemoryDealer.h b/android-headers/19/frameworks/native/include/binder/MemoryDealer.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/native/include/binder/MemoryDealer.h rename to android-headers/19/frameworks/native/include/binder/MemoryDealer.h diff --git a/android-headers/android-headers-kk/frameworks/native/include/binder/MemoryHeapBase.h b/android-headers/19/frameworks/native/include/binder/MemoryHeapBase.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/native/include/binder/MemoryHeapBase.h rename to android-headers/19/frameworks/native/include/binder/MemoryHeapBase.h diff --git a/android-headers/android-headers-kk/frameworks/native/include/binder/Parcel.h b/android-headers/19/frameworks/native/include/binder/Parcel.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/native/include/binder/Parcel.h rename to android-headers/19/frameworks/native/include/binder/Parcel.h diff --git a/android-headers/android-headers-kk/frameworks/native/include/binder/PermissionCache.h b/android-headers/19/frameworks/native/include/binder/PermissionCache.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/native/include/binder/PermissionCache.h rename to android-headers/19/frameworks/native/include/binder/PermissionCache.h diff --git a/android-headers/android-headers-kk/frameworks/native/include/binder/ProcessState.h b/android-headers/19/frameworks/native/include/binder/ProcessState.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/native/include/binder/ProcessState.h rename to android-headers/19/frameworks/native/include/binder/ProcessState.h diff --git a/android-headers/android-headers-kk/frameworks/native/include/binder/TextOutput.h b/android-headers/19/frameworks/native/include/binder/TextOutput.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/native/include/binder/TextOutput.h rename to android-headers/19/frameworks/native/include/binder/TextOutput.h diff --git a/android-headers/android-headers-kk/frameworks/native/include/gui/BitTube.h b/android-headers/19/frameworks/native/include/gui/BitTube.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/native/include/gui/BitTube.h rename to android-headers/19/frameworks/native/include/gui/BitTube.h diff --git a/android-headers/android-headers-kk/frameworks/native/include/gui/BufferItemConsumer.h b/android-headers/19/frameworks/native/include/gui/BufferItemConsumer.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/native/include/gui/BufferItemConsumer.h rename to android-headers/19/frameworks/native/include/gui/BufferItemConsumer.h diff --git a/android-headers/android-headers-kk/frameworks/native/include/gui/BufferQueue.h b/android-headers/19/frameworks/native/include/gui/BufferQueue.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/native/include/gui/BufferQueue.h rename to android-headers/19/frameworks/native/include/gui/BufferQueue.h diff --git a/android-headers/android-headers-kk/frameworks/native/include/gui/ConsumerBase.h b/android-headers/19/frameworks/native/include/gui/ConsumerBase.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/native/include/gui/ConsumerBase.h rename to android-headers/19/frameworks/native/include/gui/ConsumerBase.h diff --git a/android-headers/android-headers-kk/frameworks/native/include/gui/CpuConsumer.h b/android-headers/19/frameworks/native/include/gui/CpuConsumer.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/native/include/gui/CpuConsumer.h rename to android-headers/19/frameworks/native/include/gui/CpuConsumer.h diff --git a/android-headers/android-headers-kk/frameworks/native/include/gui/DisplayEventReceiver.h b/android-headers/19/frameworks/native/include/gui/DisplayEventReceiver.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/native/include/gui/DisplayEventReceiver.h rename to android-headers/19/frameworks/native/include/gui/DisplayEventReceiver.h diff --git a/android-headers/android-headers-kk/frameworks/native/include/gui/GLConsumer.h b/android-headers/19/frameworks/native/include/gui/GLConsumer.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/native/include/gui/GLConsumer.h rename to android-headers/19/frameworks/native/include/gui/GLConsumer.h diff --git a/android-headers/android-headers-kk/frameworks/native/include/gui/GraphicBufferAlloc.h b/android-headers/19/frameworks/native/include/gui/GraphicBufferAlloc.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/native/include/gui/GraphicBufferAlloc.h rename to android-headers/19/frameworks/native/include/gui/GraphicBufferAlloc.h diff --git a/android-headers/android-headers-kk/frameworks/native/include/gui/GuiConfig.h b/android-headers/19/frameworks/native/include/gui/GuiConfig.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/native/include/gui/GuiConfig.h rename to android-headers/19/frameworks/native/include/gui/GuiConfig.h diff --git a/android-headers/android-headers-kk/frameworks/native/include/gui/IConsumerListener.h b/android-headers/19/frameworks/native/include/gui/IConsumerListener.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/native/include/gui/IConsumerListener.h rename to android-headers/19/frameworks/native/include/gui/IConsumerListener.h diff --git a/android-headers/android-headers-kk/frameworks/native/include/gui/IDisplayEventConnection.h b/android-headers/19/frameworks/native/include/gui/IDisplayEventConnection.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/native/include/gui/IDisplayEventConnection.h rename to android-headers/19/frameworks/native/include/gui/IDisplayEventConnection.h diff --git a/android-headers/android-headers-kk/frameworks/native/include/gui/IGraphicBufferAlloc.h b/android-headers/19/frameworks/native/include/gui/IGraphicBufferAlloc.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/native/include/gui/IGraphicBufferAlloc.h rename to android-headers/19/frameworks/native/include/gui/IGraphicBufferAlloc.h diff --git a/android-headers/android-headers-kk/frameworks/native/include/gui/IGraphicBufferConsumer.h b/android-headers/19/frameworks/native/include/gui/IGraphicBufferConsumer.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/native/include/gui/IGraphicBufferConsumer.h rename to android-headers/19/frameworks/native/include/gui/IGraphicBufferConsumer.h diff --git a/android-headers/android-headers-kk/frameworks/native/include/gui/IGraphicBufferProducer.h b/android-headers/19/frameworks/native/include/gui/IGraphicBufferProducer.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/native/include/gui/IGraphicBufferProducer.h rename to android-headers/19/frameworks/native/include/gui/IGraphicBufferProducer.h diff --git a/android-headers/android-headers-kk/frameworks/native/include/gui/ISensorEventConnection.h b/android-headers/19/frameworks/native/include/gui/ISensorEventConnection.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/native/include/gui/ISensorEventConnection.h rename to android-headers/19/frameworks/native/include/gui/ISensorEventConnection.h diff --git a/android-headers/android-headers-kk/frameworks/native/include/gui/ISensorServer.h b/android-headers/19/frameworks/native/include/gui/ISensorServer.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/native/include/gui/ISensorServer.h rename to android-headers/19/frameworks/native/include/gui/ISensorServer.h diff --git a/android-headers/android-headers-kk/frameworks/native/include/gui/ISurfaceComposer.h b/android-headers/19/frameworks/native/include/gui/ISurfaceComposer.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/native/include/gui/ISurfaceComposer.h rename to android-headers/19/frameworks/native/include/gui/ISurfaceComposer.h diff --git a/android-headers/android-headers-kk/frameworks/native/include/gui/ISurfaceComposerClient.h b/android-headers/19/frameworks/native/include/gui/ISurfaceComposerClient.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/native/include/gui/ISurfaceComposerClient.h rename to android-headers/19/frameworks/native/include/gui/ISurfaceComposerClient.h diff --git a/android-headers/android-headers-kk/frameworks/native/include/gui/Sensor.h b/android-headers/19/frameworks/native/include/gui/Sensor.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/native/include/gui/Sensor.h rename to android-headers/19/frameworks/native/include/gui/Sensor.h diff --git a/android-headers/android-headers-kk/frameworks/native/include/gui/SensorEventQueue.h b/android-headers/19/frameworks/native/include/gui/SensorEventQueue.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/native/include/gui/SensorEventQueue.h rename to android-headers/19/frameworks/native/include/gui/SensorEventQueue.h diff --git a/android-headers/android-headers-kk/frameworks/native/include/gui/SensorManager.h b/android-headers/19/frameworks/native/include/gui/SensorManager.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/native/include/gui/SensorManager.h rename to android-headers/19/frameworks/native/include/gui/SensorManager.h diff --git a/android-headers/android-headers-kk/frameworks/native/include/gui/Surface.h b/android-headers/19/frameworks/native/include/gui/Surface.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/native/include/gui/Surface.h rename to android-headers/19/frameworks/native/include/gui/Surface.h diff --git a/android-headers/android-headers-kk/frameworks/native/include/gui/SurfaceComposerClient.h b/android-headers/19/frameworks/native/include/gui/SurfaceComposerClient.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/native/include/gui/SurfaceComposerClient.h rename to android-headers/19/frameworks/native/include/gui/SurfaceComposerClient.h diff --git a/android-headers/android-headers-kk/frameworks/native/include/gui/SurfaceControl.h b/android-headers/19/frameworks/native/include/gui/SurfaceControl.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/native/include/gui/SurfaceControl.h rename to android-headers/19/frameworks/native/include/gui/SurfaceControl.h diff --git a/android-headers/android-headers-kk/frameworks/native/include/media/drm/DrmAPI.h b/android-headers/19/frameworks/native/include/media/drm/DrmAPI.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/native/include/media/drm/DrmAPI.h rename to android-headers/19/frameworks/native/include/media/drm/DrmAPI.h diff --git a/android-headers/android-headers-kk/frameworks/native/include/media/editor/II420ColorConverter.h b/android-headers/19/frameworks/native/include/media/editor/II420ColorConverter.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/native/include/media/editor/II420ColorConverter.h rename to android-headers/19/frameworks/native/include/media/editor/II420ColorConverter.h diff --git a/android-headers/android-headers-kk/frameworks/native/include/media/hardware/CryptoAPI.h b/android-headers/19/frameworks/native/include/media/hardware/CryptoAPI.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/native/include/media/hardware/CryptoAPI.h rename to android-headers/19/frameworks/native/include/media/hardware/CryptoAPI.h diff --git a/android-headers/android-headers-kk/frameworks/native/include/media/hardware/HDCPAPI.h b/android-headers/19/frameworks/native/include/media/hardware/HDCPAPI.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/native/include/media/hardware/HDCPAPI.h rename to android-headers/19/frameworks/native/include/media/hardware/HDCPAPI.h diff --git a/android-headers/android-headers-kk/frameworks/native/include/media/hardware/HardwareAPI.h b/android-headers/19/frameworks/native/include/media/hardware/HardwareAPI.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/native/include/media/hardware/HardwareAPI.h rename to android-headers/19/frameworks/native/include/media/hardware/HardwareAPI.h diff --git a/android-headers/android-headers-kk/frameworks/native/include/media/hardware/MetadataBufferType.h b/android-headers/19/frameworks/native/include/media/hardware/MetadataBufferType.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/native/include/media/hardware/MetadataBufferType.h rename to android-headers/19/frameworks/native/include/media/hardware/MetadataBufferType.h diff --git a/android-headers/android-headers-kk/frameworks/native/include/media/hardware/OMXPluginBase.h b/android-headers/19/frameworks/native/include/media/hardware/OMXPluginBase.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/native/include/media/hardware/OMXPluginBase.h rename to android-headers/19/frameworks/native/include/media/hardware/OMXPluginBase.h diff --git a/android-headers/android-headers-kk/frameworks/native/include/media/openmax/OMX_Audio.h b/android-headers/19/frameworks/native/include/media/openmax/OMX_Audio.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/native/include/media/openmax/OMX_Audio.h rename to android-headers/19/frameworks/native/include/media/openmax/OMX_Audio.h diff --git a/android-headers/android-headers-kk/frameworks/native/include/media/openmax/OMX_Component.h b/android-headers/19/frameworks/native/include/media/openmax/OMX_Component.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/native/include/media/openmax/OMX_Component.h rename to android-headers/19/frameworks/native/include/media/openmax/OMX_Component.h diff --git a/android-headers/android-headers-kk/frameworks/native/include/media/openmax/OMX_ContentPipe.h b/android-headers/19/frameworks/native/include/media/openmax/OMX_ContentPipe.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/native/include/media/openmax/OMX_ContentPipe.h rename to android-headers/19/frameworks/native/include/media/openmax/OMX_ContentPipe.h diff --git a/android-headers/android-headers-kk/frameworks/native/include/media/openmax/OMX_Core.h b/android-headers/19/frameworks/native/include/media/openmax/OMX_Core.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/native/include/media/openmax/OMX_Core.h rename to android-headers/19/frameworks/native/include/media/openmax/OMX_Core.h diff --git a/android-headers/android-headers-kk/frameworks/native/include/media/openmax/OMX_IVCommon.h b/android-headers/19/frameworks/native/include/media/openmax/OMX_IVCommon.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/native/include/media/openmax/OMX_IVCommon.h rename to android-headers/19/frameworks/native/include/media/openmax/OMX_IVCommon.h diff --git a/android-headers/android-headers-kk/frameworks/native/include/media/openmax/OMX_Image.h b/android-headers/19/frameworks/native/include/media/openmax/OMX_Image.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/native/include/media/openmax/OMX_Image.h rename to android-headers/19/frameworks/native/include/media/openmax/OMX_Image.h diff --git a/android-headers/android-headers-kk/frameworks/native/include/media/openmax/OMX_Index.h b/android-headers/19/frameworks/native/include/media/openmax/OMX_Index.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/native/include/media/openmax/OMX_Index.h rename to android-headers/19/frameworks/native/include/media/openmax/OMX_Index.h diff --git a/android-headers/android-headers-kk/frameworks/native/include/media/openmax/OMX_IndexExt.h b/android-headers/19/frameworks/native/include/media/openmax/OMX_IndexExt.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/native/include/media/openmax/OMX_IndexExt.h rename to android-headers/19/frameworks/native/include/media/openmax/OMX_IndexExt.h diff --git a/android-headers/android-headers-kk/frameworks/native/include/media/openmax/OMX_Other.h b/android-headers/19/frameworks/native/include/media/openmax/OMX_Other.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/native/include/media/openmax/OMX_Other.h rename to android-headers/19/frameworks/native/include/media/openmax/OMX_Other.h diff --git a/android-headers/android-headers-kk/frameworks/native/include/media/openmax/OMX_Types.h b/android-headers/19/frameworks/native/include/media/openmax/OMX_Types.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/native/include/media/openmax/OMX_Types.h rename to android-headers/19/frameworks/native/include/media/openmax/OMX_Types.h diff --git a/android-headers/android-headers-kk/frameworks/native/include/media/openmax/OMX_Video.h b/android-headers/19/frameworks/native/include/media/openmax/OMX_Video.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/native/include/media/openmax/OMX_Video.h rename to android-headers/19/frameworks/native/include/media/openmax/OMX_Video.h diff --git a/android-headers/android-headers-kk/frameworks/native/include/media/openmax/OMX_VideoExt.h b/android-headers/19/frameworks/native/include/media/openmax/OMX_VideoExt.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/native/include/media/openmax/OMX_VideoExt.h rename to android-headers/19/frameworks/native/include/media/openmax/OMX_VideoExt.h diff --git a/android-headers/android-headers-kk/frameworks/native/include/ui/ANativeObjectBase.h b/android-headers/19/frameworks/native/include/ui/ANativeObjectBase.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/native/include/ui/ANativeObjectBase.h rename to android-headers/19/frameworks/native/include/ui/ANativeObjectBase.h diff --git a/android-headers/android-headers-kk/frameworks/native/include/ui/DisplayInfo.h b/android-headers/19/frameworks/native/include/ui/DisplayInfo.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/native/include/ui/DisplayInfo.h rename to android-headers/19/frameworks/native/include/ui/DisplayInfo.h diff --git a/android-headers/android-headers-kk/frameworks/native/include/ui/Fence.h b/android-headers/19/frameworks/native/include/ui/Fence.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/native/include/ui/Fence.h rename to android-headers/19/frameworks/native/include/ui/Fence.h diff --git a/android-headers/android-headers-kk/frameworks/native/include/ui/FramebufferNativeWindow.h b/android-headers/19/frameworks/native/include/ui/FramebufferNativeWindow.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/native/include/ui/FramebufferNativeWindow.h rename to android-headers/19/frameworks/native/include/ui/FramebufferNativeWindow.h diff --git a/android-headers/android-headers-kk/frameworks/native/include/ui/GraphicBuffer.h b/android-headers/19/frameworks/native/include/ui/GraphicBuffer.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/native/include/ui/GraphicBuffer.h rename to android-headers/19/frameworks/native/include/ui/GraphicBuffer.h diff --git a/android-headers/android-headers-kk/frameworks/native/include/ui/GraphicBufferAllocator.h b/android-headers/19/frameworks/native/include/ui/GraphicBufferAllocator.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/native/include/ui/GraphicBufferAllocator.h rename to android-headers/19/frameworks/native/include/ui/GraphicBufferAllocator.h diff --git a/android-headers/android-headers-kk/frameworks/native/include/ui/GraphicBufferMapper.h b/android-headers/19/frameworks/native/include/ui/GraphicBufferMapper.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/native/include/ui/GraphicBufferMapper.h rename to android-headers/19/frameworks/native/include/ui/GraphicBufferMapper.h diff --git a/android-headers/android-headers-kk/frameworks/native/include/ui/PixelFormat.h b/android-headers/19/frameworks/native/include/ui/PixelFormat.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/native/include/ui/PixelFormat.h rename to android-headers/19/frameworks/native/include/ui/PixelFormat.h diff --git a/android-headers/android-headers-kk/frameworks/native/include/ui/Point.h b/android-headers/19/frameworks/native/include/ui/Point.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/native/include/ui/Point.h rename to android-headers/19/frameworks/native/include/ui/Point.h diff --git a/android-headers/android-headers-kk/frameworks/native/include/ui/Rect.h b/android-headers/19/frameworks/native/include/ui/Rect.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/native/include/ui/Rect.h rename to android-headers/19/frameworks/native/include/ui/Rect.h diff --git a/android-headers/android-headers-kk/frameworks/native/include/ui/Region.h b/android-headers/19/frameworks/native/include/ui/Region.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/native/include/ui/Region.h rename to android-headers/19/frameworks/native/include/ui/Region.h diff --git a/android-headers/android-headers-kk/frameworks/native/include/ui/TMatHelpers.h b/android-headers/19/frameworks/native/include/ui/TMatHelpers.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/native/include/ui/TMatHelpers.h rename to android-headers/19/frameworks/native/include/ui/TMatHelpers.h diff --git a/android-headers/android-headers-kk/frameworks/native/include/ui/TVecHelpers.h b/android-headers/19/frameworks/native/include/ui/TVecHelpers.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/native/include/ui/TVecHelpers.h rename to android-headers/19/frameworks/native/include/ui/TVecHelpers.h diff --git a/android-headers/android-headers-kk/frameworks/native/include/ui/UiConfig.h b/android-headers/19/frameworks/native/include/ui/UiConfig.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/native/include/ui/UiConfig.h rename to android-headers/19/frameworks/native/include/ui/UiConfig.h diff --git a/android-headers/android-headers-kk/frameworks/native/include/ui/mat4.h b/android-headers/19/frameworks/native/include/ui/mat4.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/native/include/ui/mat4.h rename to android-headers/19/frameworks/native/include/ui/mat4.h diff --git a/android-headers/android-headers-kk/frameworks/native/include/ui/vec2.h b/android-headers/19/frameworks/native/include/ui/vec2.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/native/include/ui/vec2.h rename to android-headers/19/frameworks/native/include/ui/vec2.h diff --git a/android-headers/android-headers-kk/frameworks/native/include/ui/vec3.h b/android-headers/19/frameworks/native/include/ui/vec3.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/native/include/ui/vec3.h rename to android-headers/19/frameworks/native/include/ui/vec3.h diff --git a/android-headers/android-headers-kk/frameworks/native/include/ui/vec4.h b/android-headers/19/frameworks/native/include/ui/vec4.h similarity index 100% rename from android-headers/android-headers-kk/frameworks/native/include/ui/vec4.h rename to android-headers/19/frameworks/native/include/ui/vec4.h diff --git a/android-headers/android-headers-kk/hardware/libhardware/include/hardware/audio.h b/android-headers/19/hardware/libhardware/include/hardware/audio.h similarity index 100% rename from android-headers/android-headers-kk/hardware/libhardware/include/hardware/audio.h rename to android-headers/19/hardware/libhardware/include/hardware/audio.h diff --git a/android-headers/android-headers-kk/hardware/libhardware/include/hardware/audio_effect.h b/android-headers/19/hardware/libhardware/include/hardware/audio_effect.h similarity index 100% rename from android-headers/android-headers-kk/hardware/libhardware/include/hardware/audio_effect.h rename to android-headers/19/hardware/libhardware/include/hardware/audio_effect.h diff --git a/android-headers/android-headers-kk/hardware/libhardware/include/hardware/audio_policy.h b/android-headers/19/hardware/libhardware/include/hardware/audio_policy.h similarity index 100% rename from android-headers/android-headers-kk/hardware/libhardware/include/hardware/audio_policy.h rename to android-headers/19/hardware/libhardware/include/hardware/audio_policy.h diff --git a/android-headers/android-headers-kk/hardware/libhardware/include/hardware/bluetooth.h b/android-headers/19/hardware/libhardware/include/hardware/bluetooth.h similarity index 100% rename from android-headers/android-headers-kk/hardware/libhardware/include/hardware/bluetooth.h rename to android-headers/19/hardware/libhardware/include/hardware/bluetooth.h diff --git a/android-headers/android-headers-kk/hardware/libhardware/include/hardware/bt_av.h b/android-headers/19/hardware/libhardware/include/hardware/bt_av.h similarity index 100% rename from android-headers/android-headers-kk/hardware/libhardware/include/hardware/bt_av.h rename to android-headers/19/hardware/libhardware/include/hardware/bt_av.h diff --git a/android-headers/android-headers-kk/hardware/libhardware/include/hardware/bt_gatt.h b/android-headers/19/hardware/libhardware/include/hardware/bt_gatt.h similarity index 100% rename from android-headers/android-headers-kk/hardware/libhardware/include/hardware/bt_gatt.h rename to android-headers/19/hardware/libhardware/include/hardware/bt_gatt.h diff --git a/android-headers/android-headers-kk/hardware/libhardware/include/hardware/bt_gatt_client.h b/android-headers/19/hardware/libhardware/include/hardware/bt_gatt_client.h similarity index 100% rename from android-headers/android-headers-kk/hardware/libhardware/include/hardware/bt_gatt_client.h rename to android-headers/19/hardware/libhardware/include/hardware/bt_gatt_client.h diff --git a/android-headers/android-headers-kk/hardware/libhardware/include/hardware/bt_gatt_server.h b/android-headers/19/hardware/libhardware/include/hardware/bt_gatt_server.h similarity index 100% rename from android-headers/android-headers-kk/hardware/libhardware/include/hardware/bt_gatt_server.h rename to android-headers/19/hardware/libhardware/include/hardware/bt_gatt_server.h diff --git a/android-headers/android-headers-kk/hardware/libhardware/include/hardware/bt_gatt_types.h b/android-headers/19/hardware/libhardware/include/hardware/bt_gatt_types.h similarity index 100% rename from android-headers/android-headers-kk/hardware/libhardware/include/hardware/bt_gatt_types.h rename to android-headers/19/hardware/libhardware/include/hardware/bt_gatt_types.h diff --git a/android-headers/android-headers-kk/hardware/libhardware/include/hardware/bt_hf.h b/android-headers/19/hardware/libhardware/include/hardware/bt_hf.h similarity index 100% rename from android-headers/android-headers-kk/hardware/libhardware/include/hardware/bt_hf.h rename to android-headers/19/hardware/libhardware/include/hardware/bt_hf.h diff --git a/android-headers/android-headers-kk/hardware/libhardware/include/hardware/bt_hh.h b/android-headers/19/hardware/libhardware/include/hardware/bt_hh.h similarity index 100% rename from android-headers/android-headers-kk/hardware/libhardware/include/hardware/bt_hh.h rename to android-headers/19/hardware/libhardware/include/hardware/bt_hh.h diff --git a/android-headers/android-headers-kk/hardware/libhardware/include/hardware/bt_hl.h b/android-headers/19/hardware/libhardware/include/hardware/bt_hl.h similarity index 100% rename from android-headers/android-headers-kk/hardware/libhardware/include/hardware/bt_hl.h rename to android-headers/19/hardware/libhardware/include/hardware/bt_hl.h diff --git a/android-headers/android-headers-kk/hardware/libhardware/include/hardware/bt_pan.h b/android-headers/19/hardware/libhardware/include/hardware/bt_pan.h similarity index 100% rename from android-headers/android-headers-kk/hardware/libhardware/include/hardware/bt_pan.h rename to android-headers/19/hardware/libhardware/include/hardware/bt_pan.h diff --git a/android-headers/android-headers-kk/hardware/libhardware/include/hardware/bt_rc.h b/android-headers/19/hardware/libhardware/include/hardware/bt_rc.h similarity index 100% rename from android-headers/android-headers-kk/hardware/libhardware/include/hardware/bt_rc.h rename to android-headers/19/hardware/libhardware/include/hardware/bt_rc.h diff --git a/android-headers/android-headers-kk/hardware/libhardware/include/hardware/bt_sock.h b/android-headers/19/hardware/libhardware/include/hardware/bt_sock.h similarity index 100% rename from android-headers/android-headers-kk/hardware/libhardware/include/hardware/bt_sock.h rename to android-headers/19/hardware/libhardware/include/hardware/bt_sock.h diff --git a/android-headers/android-headers-kk/hardware/libhardware/include/hardware/camera.h b/android-headers/19/hardware/libhardware/include/hardware/camera.h similarity index 100% rename from android-headers/android-headers-kk/hardware/libhardware/include/hardware/camera.h rename to android-headers/19/hardware/libhardware/include/hardware/camera.h diff --git a/android-headers/android-headers-kk/hardware/libhardware/include/hardware/camera2.h b/android-headers/19/hardware/libhardware/include/hardware/camera2.h similarity index 100% rename from android-headers/android-headers-kk/hardware/libhardware/include/hardware/camera2.h rename to android-headers/19/hardware/libhardware/include/hardware/camera2.h diff --git a/android-headers/android-headers-kk/hardware/libhardware/include/hardware/camera3.h b/android-headers/19/hardware/libhardware/include/hardware/camera3.h similarity index 100% rename from android-headers/android-headers-kk/hardware/libhardware/include/hardware/camera3.h rename to android-headers/19/hardware/libhardware/include/hardware/camera3.h diff --git a/android-headers/android-headers-kk/hardware/libhardware/include/hardware/camera_common.h b/android-headers/19/hardware/libhardware/include/hardware/camera_common.h similarity index 100% rename from android-headers/android-headers-kk/hardware/libhardware/include/hardware/camera_common.h rename to android-headers/19/hardware/libhardware/include/hardware/camera_common.h diff --git a/android-headers/android-headers-kk/hardware/libhardware/include/hardware/consumerir.h b/android-headers/19/hardware/libhardware/include/hardware/consumerir.h similarity index 100% rename from android-headers/android-headers-kk/hardware/libhardware/include/hardware/consumerir.h rename to android-headers/19/hardware/libhardware/include/hardware/consumerir.h diff --git a/android-headers/android-headers-kk/hardware/libhardware/include/hardware/fb.h b/android-headers/19/hardware/libhardware/include/hardware/fb.h similarity index 100% rename from android-headers/android-headers-kk/hardware/libhardware/include/hardware/fb.h rename to android-headers/19/hardware/libhardware/include/hardware/fb.h diff --git a/android-headers/android-headers-kk/hardware/libhardware/include/hardware/fused_location.h b/android-headers/19/hardware/libhardware/include/hardware/fused_location.h similarity index 100% rename from android-headers/android-headers-kk/hardware/libhardware/include/hardware/fused_location.h rename to android-headers/19/hardware/libhardware/include/hardware/fused_location.h diff --git a/android-headers/android-headers-kk/hardware/libhardware/include/hardware/gps.h b/android-headers/19/hardware/libhardware/include/hardware/gps.h similarity index 100% rename from android-headers/android-headers-kk/hardware/libhardware/include/hardware/gps.h rename to android-headers/19/hardware/libhardware/include/hardware/gps.h diff --git a/android-headers/android-headers-kk/hardware/libhardware/include/hardware/gralloc.h b/android-headers/19/hardware/libhardware/include/hardware/gralloc.h similarity index 100% rename from android-headers/android-headers-kk/hardware/libhardware/include/hardware/gralloc.h rename to android-headers/19/hardware/libhardware/include/hardware/gralloc.h diff --git a/android-headers/android-headers-kk/hardware/libhardware/include/hardware/hardware.h b/android-headers/19/hardware/libhardware/include/hardware/hardware.h similarity index 100% rename from android-headers/android-headers-kk/hardware/libhardware/include/hardware/hardware.h rename to android-headers/19/hardware/libhardware/include/hardware/hardware.h diff --git a/android-headers/android-headers-kk/hardware/libhardware/include/hardware/hwcomposer.h b/android-headers/19/hardware/libhardware/include/hardware/hwcomposer.h similarity index 100% rename from android-headers/android-headers-kk/hardware/libhardware/include/hardware/hwcomposer.h rename to android-headers/19/hardware/libhardware/include/hardware/hwcomposer.h diff --git a/android-headers/android-headers-kk/hardware/libhardware/include/hardware/hwcomposer_defs.h b/android-headers/19/hardware/libhardware/include/hardware/hwcomposer_defs.h similarity index 100% rename from android-headers/android-headers-kk/hardware/libhardware/include/hardware/hwcomposer_defs.h rename to android-headers/19/hardware/libhardware/include/hardware/hwcomposer_defs.h diff --git a/android-headers/android-headers-kk/hardware/libhardware/include/hardware/keymaster.h b/android-headers/19/hardware/libhardware/include/hardware/keymaster.h similarity index 100% rename from android-headers/android-headers-kk/hardware/libhardware/include/hardware/keymaster.h rename to android-headers/19/hardware/libhardware/include/hardware/keymaster.h diff --git a/android-headers/android-headers-kk/hardware/libhardware/include/hardware/lights.h b/android-headers/19/hardware/libhardware/include/hardware/lights.h similarity index 100% rename from android-headers/android-headers-kk/hardware/libhardware/include/hardware/lights.h rename to android-headers/19/hardware/libhardware/include/hardware/lights.h diff --git a/android-headers/android-headers-kk/hardware/libhardware/include/hardware/local_time_hal.h b/android-headers/19/hardware/libhardware/include/hardware/local_time_hal.h similarity index 100% rename from android-headers/android-headers-kk/hardware/libhardware/include/hardware/local_time_hal.h rename to android-headers/19/hardware/libhardware/include/hardware/local_time_hal.h diff --git a/android-headers/android-headers-kk/hardware/libhardware/include/hardware/memtrack.h b/android-headers/19/hardware/libhardware/include/hardware/memtrack.h similarity index 100% rename from android-headers/android-headers-kk/hardware/libhardware/include/hardware/memtrack.h rename to android-headers/19/hardware/libhardware/include/hardware/memtrack.h diff --git a/android-headers/android-headers-kk/hardware/libhardware/include/hardware/nfc.h b/android-headers/19/hardware/libhardware/include/hardware/nfc.h similarity index 100% rename from android-headers/android-headers-kk/hardware/libhardware/include/hardware/nfc.h rename to android-headers/19/hardware/libhardware/include/hardware/nfc.h diff --git a/android-headers/android-headers-kk/hardware/libhardware/include/hardware/power.h b/android-headers/19/hardware/libhardware/include/hardware/power.h similarity index 100% rename from android-headers/android-headers-kk/hardware/libhardware/include/hardware/power.h rename to android-headers/19/hardware/libhardware/include/hardware/power.h diff --git a/android-headers/android-headers-kk/hardware/libhardware/include/hardware/qemu_pipe.h b/android-headers/19/hardware/libhardware/include/hardware/qemu_pipe.h similarity index 100% rename from android-headers/android-headers-kk/hardware/libhardware/include/hardware/qemu_pipe.h rename to android-headers/19/hardware/libhardware/include/hardware/qemu_pipe.h diff --git a/android-headers/android-headers-kk/hardware/libhardware/include/hardware/qemud.h b/android-headers/19/hardware/libhardware/include/hardware/qemud.h similarity index 100% rename from android-headers/android-headers-kk/hardware/libhardware/include/hardware/qemud.h rename to android-headers/19/hardware/libhardware/include/hardware/qemud.h diff --git a/android-headers/android-headers-kk/hardware/libhardware/include/hardware/sensors.h b/android-headers/19/hardware/libhardware/include/hardware/sensors.h similarity index 100% rename from android-headers/android-headers-kk/hardware/libhardware/include/hardware/sensors.h rename to android-headers/19/hardware/libhardware/include/hardware/sensors.h diff --git a/android-headers/android-headers-kk/system/core/include/cutils/android_reboot.h b/android-headers/19/system/core/include/cutils/android_reboot.h similarity index 100% rename from android-headers/android-headers-kk/system/core/include/cutils/android_reboot.h rename to android-headers/19/system/core/include/cutils/android_reboot.h diff --git a/android-headers/android-headers-kk/system/core/include/cutils/aref.h b/android-headers/19/system/core/include/cutils/aref.h similarity index 100% rename from android-headers/android-headers-kk/system/core/include/cutils/aref.h rename to android-headers/19/system/core/include/cutils/aref.h diff --git a/android-headers/android-headers-kk/system/core/include/cutils/ashmem.h b/android-headers/19/system/core/include/cutils/ashmem.h similarity index 100% rename from android-headers/android-headers-kk/system/core/include/cutils/ashmem.h rename to android-headers/19/system/core/include/cutils/ashmem.h diff --git a/android-headers/android-headers-kk/system/core/include/cutils/atomic-arm.h b/android-headers/19/system/core/include/cutils/atomic-arm.h similarity index 100% rename from android-headers/android-headers-kk/system/core/include/cutils/atomic-arm.h rename to android-headers/19/system/core/include/cutils/atomic-arm.h diff --git a/android-headers/android-headers-kk/system/core/include/cutils/atomic-inline.h b/android-headers/19/system/core/include/cutils/atomic-inline.h similarity index 100% rename from android-headers/android-headers-kk/system/core/include/cutils/atomic-inline.h rename to android-headers/19/system/core/include/cutils/atomic-inline.h diff --git a/android-headers/android-headers-kk/system/core/include/cutils/atomic-mips.h b/android-headers/19/system/core/include/cutils/atomic-mips.h similarity index 100% rename from android-headers/android-headers-kk/system/core/include/cutils/atomic-mips.h rename to android-headers/19/system/core/include/cutils/atomic-mips.h diff --git a/android-headers/android-headers-kk/system/core/include/cutils/atomic-x86.h b/android-headers/19/system/core/include/cutils/atomic-x86.h similarity index 100% rename from android-headers/android-headers-kk/system/core/include/cutils/atomic-x86.h rename to android-headers/19/system/core/include/cutils/atomic-x86.h diff --git a/android-headers/android-headers-kk/system/core/include/cutils/atomic.h b/android-headers/19/system/core/include/cutils/atomic.h similarity index 100% rename from android-headers/android-headers-kk/system/core/include/cutils/atomic.h rename to android-headers/19/system/core/include/cutils/atomic.h diff --git a/android-headers/android-headers-kk/system/core/include/cutils/bitops.h b/android-headers/19/system/core/include/cutils/bitops.h similarity index 100% rename from android-headers/android-headers-kk/system/core/include/cutils/bitops.h rename to android-headers/19/system/core/include/cutils/bitops.h diff --git a/android-headers/android-headers-kk/system/core/include/cutils/compiler.h b/android-headers/19/system/core/include/cutils/compiler.h similarity index 100% rename from android-headers/android-headers-kk/system/core/include/cutils/compiler.h rename to android-headers/19/system/core/include/cutils/compiler.h diff --git a/android-headers/android-headers-kk/system/core/include/cutils/config_utils.h b/android-headers/19/system/core/include/cutils/config_utils.h similarity index 100% rename from android-headers/android-headers-kk/system/core/include/cutils/config_utils.h rename to android-headers/19/system/core/include/cutils/config_utils.h diff --git a/android-headers/android-headers-kk/system/core/include/cutils/cpu_info.h b/android-headers/19/system/core/include/cutils/cpu_info.h similarity index 100% rename from android-headers/android-headers-kk/system/core/include/cutils/cpu_info.h rename to android-headers/19/system/core/include/cutils/cpu_info.h diff --git a/android-headers/android-headers-kk/system/core/include/cutils/debugger.h b/android-headers/19/system/core/include/cutils/debugger.h similarity index 100% rename from android-headers/android-headers-kk/system/core/include/cutils/debugger.h rename to android-headers/19/system/core/include/cutils/debugger.h diff --git a/android-headers/android-headers-kk/system/core/include/cutils/dir_hash.h b/android-headers/19/system/core/include/cutils/dir_hash.h similarity index 100% rename from android-headers/android-headers-kk/system/core/include/cutils/dir_hash.h rename to android-headers/19/system/core/include/cutils/dir_hash.h diff --git a/android-headers/android-headers-kk/system/core/include/cutils/fs.h b/android-headers/19/system/core/include/cutils/fs.h similarity index 100% rename from android-headers/android-headers-kk/system/core/include/cutils/fs.h rename to android-headers/19/system/core/include/cutils/fs.h diff --git a/android-headers/android-headers-kk/system/core/include/cutils/hashmap.h b/android-headers/19/system/core/include/cutils/hashmap.h similarity index 100% rename from android-headers/android-headers-kk/system/core/include/cutils/hashmap.h rename to android-headers/19/system/core/include/cutils/hashmap.h diff --git a/android-headers/android-headers-kk/system/core/include/cutils/iosched_policy.h b/android-headers/19/system/core/include/cutils/iosched_policy.h similarity index 100% rename from android-headers/android-headers-kk/system/core/include/cutils/iosched_policy.h rename to android-headers/19/system/core/include/cutils/iosched_policy.h diff --git a/android-headers/android-headers-kk/system/core/include/cutils/jstring.h b/android-headers/19/system/core/include/cutils/jstring.h similarity index 100% rename from android-headers/android-headers-kk/system/core/include/cutils/jstring.h rename to android-headers/19/system/core/include/cutils/jstring.h diff --git a/android-headers/android-headers-kk/system/core/include/cutils/klog.h b/android-headers/19/system/core/include/cutils/klog.h similarity index 100% rename from android-headers/android-headers-kk/system/core/include/cutils/klog.h rename to android-headers/19/system/core/include/cutils/klog.h diff --git a/android-headers/android-headers-kk/system/core/include/cutils/list.h b/android-headers/19/system/core/include/cutils/list.h similarity index 100% rename from android-headers/android-headers-kk/system/core/include/cutils/list.h rename to android-headers/19/system/core/include/cutils/list.h diff --git a/android-headers/android-headers-kk/system/core/include/cutils/log.h b/android-headers/19/system/core/include/cutils/log.h similarity index 100% rename from android-headers/android-headers-kk/system/core/include/cutils/log.h rename to android-headers/19/system/core/include/cutils/log.h diff --git a/android-headers/android-headers-kk/system/core/include/cutils/memory.h b/android-headers/19/system/core/include/cutils/memory.h similarity index 100% rename from android-headers/android-headers-kk/system/core/include/cutils/memory.h rename to android-headers/19/system/core/include/cutils/memory.h diff --git a/android-headers/android-headers-kk/system/core/include/cutils/misc.h b/android-headers/19/system/core/include/cutils/misc.h similarity index 100% rename from android-headers/android-headers-kk/system/core/include/cutils/misc.h rename to android-headers/19/system/core/include/cutils/misc.h diff --git a/android-headers/android-headers-kk/system/core/include/cutils/multiuser.h b/android-headers/19/system/core/include/cutils/multiuser.h similarity index 100% rename from android-headers/android-headers-kk/system/core/include/cutils/multiuser.h rename to android-headers/19/system/core/include/cutils/multiuser.h diff --git a/android-headers/android-headers-kk/system/core/include/cutils/native_handle.h b/android-headers/19/system/core/include/cutils/native_handle.h similarity index 100% rename from android-headers/android-headers-kk/system/core/include/cutils/native_handle.h rename to android-headers/19/system/core/include/cutils/native_handle.h diff --git a/android-headers/android-headers-kk/system/core/include/cutils/open_memstream.h b/android-headers/19/system/core/include/cutils/open_memstream.h similarity index 100% rename from android-headers/android-headers-kk/system/core/include/cutils/open_memstream.h rename to android-headers/19/system/core/include/cutils/open_memstream.h diff --git a/android-headers/android-headers-kk/system/core/include/cutils/partition_utils.h b/android-headers/19/system/core/include/cutils/partition_utils.h similarity index 100% rename from android-headers/android-headers-kk/system/core/include/cutils/partition_utils.h rename to android-headers/19/system/core/include/cutils/partition_utils.h diff --git a/android-headers/android-headers-kk/system/core/include/cutils/process_name.h b/android-headers/19/system/core/include/cutils/process_name.h similarity index 100% rename from android-headers/android-headers-kk/system/core/include/cutils/process_name.h rename to android-headers/19/system/core/include/cutils/process_name.h diff --git a/android-headers/android-headers-kk/system/core/include/cutils/properties.h b/android-headers/19/system/core/include/cutils/properties.h similarity index 100% rename from android-headers/android-headers-kk/system/core/include/cutils/properties.h rename to android-headers/19/system/core/include/cutils/properties.h diff --git a/android-headers/android-headers-kk/system/core/include/cutils/qtaguid.h b/android-headers/19/system/core/include/cutils/qtaguid.h similarity index 100% rename from android-headers/android-headers-kk/system/core/include/cutils/qtaguid.h rename to android-headers/19/system/core/include/cutils/qtaguid.h diff --git a/android-headers/android-headers-kk/system/core/include/cutils/record_stream.h b/android-headers/19/system/core/include/cutils/record_stream.h similarity index 100% rename from android-headers/android-headers-kk/system/core/include/cutils/record_stream.h rename to android-headers/19/system/core/include/cutils/record_stream.h diff --git a/android-headers/android-headers-kk/system/core/include/cutils/sched_policy.h b/android-headers/19/system/core/include/cutils/sched_policy.h similarity index 100% rename from android-headers/android-headers-kk/system/core/include/cutils/sched_policy.h rename to android-headers/19/system/core/include/cutils/sched_policy.h diff --git a/android-headers/android-headers-kk/system/core/include/cutils/sockets.h b/android-headers/19/system/core/include/cutils/sockets.h similarity index 100% rename from android-headers/android-headers-kk/system/core/include/cutils/sockets.h rename to android-headers/19/system/core/include/cutils/sockets.h diff --git a/android-headers/android-headers-kk/system/core/include/cutils/str_parms.h b/android-headers/19/system/core/include/cutils/str_parms.h similarity index 100% rename from android-headers/android-headers-kk/system/core/include/cutils/str_parms.h rename to android-headers/19/system/core/include/cutils/str_parms.h diff --git a/android-headers/android-headers-kk/system/core/include/cutils/threads.h b/android-headers/19/system/core/include/cutils/threads.h similarity index 100% rename from android-headers/android-headers-kk/system/core/include/cutils/threads.h rename to android-headers/19/system/core/include/cutils/threads.h diff --git a/android-headers/android-headers-kk/system/core/include/cutils/trace.h b/android-headers/19/system/core/include/cutils/trace.h similarity index 100% rename from android-headers/android-headers-kk/system/core/include/cutils/trace.h rename to android-headers/19/system/core/include/cutils/trace.h diff --git a/android-headers/android-headers-kk/system/core/include/cutils/tztime.h b/android-headers/19/system/core/include/cutils/tztime.h similarity index 100% rename from android-headers/android-headers-kk/system/core/include/cutils/tztime.h rename to android-headers/19/system/core/include/cutils/tztime.h diff --git a/android-headers/android-headers-kk/system/core/include/cutils/uevent.h b/android-headers/19/system/core/include/cutils/uevent.h similarity index 100% rename from android-headers/android-headers-kk/system/core/include/cutils/uevent.h rename to android-headers/19/system/core/include/cutils/uevent.h diff --git a/android-headers/android-headers-kk/system/core/include/log/event_tag_map.h b/android-headers/19/system/core/include/log/event_tag_map.h similarity index 100% rename from android-headers/android-headers-kk/system/core/include/log/event_tag_map.h rename to android-headers/19/system/core/include/log/event_tag_map.h diff --git a/android-headers/android-headers-kk/system/core/include/log/log.h b/android-headers/19/system/core/include/log/log.h similarity index 100% rename from android-headers/android-headers-kk/system/core/include/log/log.h rename to android-headers/19/system/core/include/log/log.h diff --git a/android-headers/android-headers-kk/system/core/include/log/logd.h b/android-headers/19/system/core/include/log/logd.h similarity index 100% rename from android-headers/android-headers-kk/system/core/include/log/logd.h rename to android-headers/19/system/core/include/log/logd.h diff --git a/android-headers/android-headers-kk/system/core/include/log/logger.h b/android-headers/19/system/core/include/log/logger.h similarity index 100% rename from android-headers/android-headers-kk/system/core/include/log/logger.h rename to android-headers/19/system/core/include/log/logger.h diff --git a/android-headers/android-headers-kk/system/core/include/log/logprint.h b/android-headers/19/system/core/include/log/logprint.h similarity index 100% rename from android-headers/android-headers-kk/system/core/include/log/logprint.h rename to android-headers/19/system/core/include/log/logprint.h diff --git a/android-headers/android-headers-kk/system/core/include/log/uio.h b/android-headers/19/system/core/include/log/uio.h similarity index 100% rename from android-headers/android-headers-kk/system/core/include/log/uio.h rename to android-headers/19/system/core/include/log/uio.h diff --git a/android-headers/android-headers-kk/system/core/include/sync/sw_sync.h b/android-headers/19/system/core/include/sync/sw_sync.h similarity index 100% rename from android-headers/android-headers-kk/system/core/include/sync/sw_sync.h rename to android-headers/19/system/core/include/sync/sw_sync.h diff --git a/android-headers/android-headers-kk/system/core/include/sync/sync.h b/android-headers/19/system/core/include/sync/sync.h similarity index 100% rename from android-headers/android-headers-kk/system/core/include/sync/sync.h rename to android-headers/19/system/core/include/sync/sync.h diff --git a/android-headers/android-headers-kk/system/core/include/system/audio.h b/android-headers/19/system/core/include/system/audio.h similarity index 100% rename from android-headers/android-headers-kk/system/core/include/system/audio.h rename to android-headers/19/system/core/include/system/audio.h diff --git a/android-headers/android-headers-kk/system/core/include/system/audio_policy.h b/android-headers/19/system/core/include/system/audio_policy.h similarity index 100% rename from android-headers/android-headers-kk/system/core/include/system/audio_policy.h rename to android-headers/19/system/core/include/system/audio_policy.h diff --git a/android-headers/android-headers-kk/system/core/include/system/camera.h b/android-headers/19/system/core/include/system/camera.h similarity index 100% rename from android-headers/android-headers-kk/system/core/include/system/camera.h rename to android-headers/19/system/core/include/system/camera.h diff --git a/android-headers/android-headers-kk/system/core/include/system/graphics.h b/android-headers/19/system/core/include/system/graphics.h similarity index 100% rename from android-headers/android-headers-kk/system/core/include/system/graphics.h rename to android-headers/19/system/core/include/system/graphics.h diff --git a/android-headers/android-headers-kk/system/core/include/system/thread_defs.h b/android-headers/19/system/core/include/system/thread_defs.h similarity index 100% rename from android-headers/android-headers-kk/system/core/include/system/thread_defs.h rename to android-headers/19/system/core/include/system/thread_defs.h diff --git a/android-headers/android-headers-kk/system/core/include/system/window.h b/android-headers/19/system/core/include/system/window.h similarity index 100% rename from android-headers/android-headers-kk/system/core/include/system/window.h rename to android-headers/19/system/core/include/system/window.h diff --git a/android-headers/android-headers-kk/system/core/include/utils/AndroidThreads.h b/android-headers/19/system/core/include/utils/AndroidThreads.h similarity index 100% rename from android-headers/android-headers-kk/system/core/include/utils/AndroidThreads.h rename to android-headers/19/system/core/include/utils/AndroidThreads.h diff --git a/android-headers/android-headers-kk/system/core/include/utils/Atomic.h b/android-headers/19/system/core/include/utils/Atomic.h similarity index 100% rename from android-headers/android-headers-kk/system/core/include/utils/Atomic.h rename to android-headers/19/system/core/include/utils/Atomic.h diff --git a/android-headers/android-headers-kk/system/core/include/utils/BasicHashtable.h b/android-headers/19/system/core/include/utils/BasicHashtable.h similarity index 100% rename from android-headers/android-headers-kk/system/core/include/utils/BasicHashtable.h rename to android-headers/19/system/core/include/utils/BasicHashtable.h diff --git a/android-headers/android-headers-kk/system/core/include/utils/BitSet.h b/android-headers/19/system/core/include/utils/BitSet.h similarity index 100% rename from android-headers/android-headers-kk/system/core/include/utils/BitSet.h rename to android-headers/19/system/core/include/utils/BitSet.h diff --git a/android-headers/android-headers-kk/system/core/include/utils/BlobCache.h b/android-headers/19/system/core/include/utils/BlobCache.h similarity index 100% rename from android-headers/android-headers-kk/system/core/include/utils/BlobCache.h rename to android-headers/19/system/core/include/utils/BlobCache.h diff --git a/android-headers/android-headers-kk/system/core/include/utils/ByteOrder.h b/android-headers/19/system/core/include/utils/ByteOrder.h similarity index 100% rename from android-headers/android-headers-kk/system/core/include/utils/ByteOrder.h rename to android-headers/19/system/core/include/utils/ByteOrder.h diff --git a/android-headers/android-headers-kk/system/core/include/utils/CallStack.h b/android-headers/19/system/core/include/utils/CallStack.h similarity index 100% rename from android-headers/android-headers-kk/system/core/include/utils/CallStack.h rename to android-headers/19/system/core/include/utils/CallStack.h diff --git a/android-headers/android-headers-kk/system/core/include/utils/Compat.h b/android-headers/19/system/core/include/utils/Compat.h similarity index 100% rename from android-headers/android-headers-kk/system/core/include/utils/Compat.h rename to android-headers/19/system/core/include/utils/Compat.h diff --git a/android-headers/android-headers-kk/system/core/include/utils/Condition.h b/android-headers/19/system/core/include/utils/Condition.h similarity index 100% rename from android-headers/android-headers-kk/system/core/include/utils/Condition.h rename to android-headers/19/system/core/include/utils/Condition.h diff --git a/android-headers/android-headers-kk/system/core/include/utils/Debug.h b/android-headers/19/system/core/include/utils/Debug.h similarity index 100% rename from android-headers/android-headers-kk/system/core/include/utils/Debug.h rename to android-headers/19/system/core/include/utils/Debug.h diff --git a/android-headers/android-headers-kk/system/core/include/utils/Endian.h b/android-headers/19/system/core/include/utils/Endian.h similarity index 100% rename from android-headers/android-headers-kk/system/core/include/utils/Endian.h rename to android-headers/19/system/core/include/utils/Endian.h diff --git a/android-headers/android-headers-kk/system/core/include/utils/Errors.h b/android-headers/19/system/core/include/utils/Errors.h similarity index 100% rename from android-headers/android-headers-kk/system/core/include/utils/Errors.h rename to android-headers/19/system/core/include/utils/Errors.h diff --git a/android-headers/android-headers-kk/system/core/include/utils/FileMap.h b/android-headers/19/system/core/include/utils/FileMap.h similarity index 100% rename from android-headers/android-headers-kk/system/core/include/utils/FileMap.h rename to android-headers/19/system/core/include/utils/FileMap.h diff --git a/android-headers/android-headers-kk/system/core/include/utils/Flattenable.h b/android-headers/19/system/core/include/utils/Flattenable.h similarity index 100% rename from android-headers/android-headers-kk/system/core/include/utils/Flattenable.h rename to android-headers/19/system/core/include/utils/Flattenable.h diff --git a/android-headers/android-headers-kk/system/core/include/utils/Functor.h b/android-headers/19/system/core/include/utils/Functor.h similarity index 100% rename from android-headers/android-headers-kk/system/core/include/utils/Functor.h rename to android-headers/19/system/core/include/utils/Functor.h diff --git a/android-headers/android-headers-kk/system/core/include/utils/JenkinsHash.h b/android-headers/19/system/core/include/utils/JenkinsHash.h similarity index 100% rename from android-headers/android-headers-kk/system/core/include/utils/JenkinsHash.h rename to android-headers/19/system/core/include/utils/JenkinsHash.h diff --git a/android-headers/android-headers-kk/system/core/include/utils/KeyedVector.h b/android-headers/19/system/core/include/utils/KeyedVector.h similarity index 100% rename from android-headers/android-headers-kk/system/core/include/utils/KeyedVector.h rename to android-headers/19/system/core/include/utils/KeyedVector.h diff --git a/android-headers/android-headers-kk/system/core/include/utils/LinearAllocator.h b/android-headers/19/system/core/include/utils/LinearAllocator.h similarity index 100% rename from android-headers/android-headers-kk/system/core/include/utils/LinearAllocator.h rename to android-headers/19/system/core/include/utils/LinearAllocator.h diff --git a/android-headers/android-headers-kk/system/core/include/utils/LinearTransform.h b/android-headers/19/system/core/include/utils/LinearTransform.h similarity index 100% rename from android-headers/android-headers-kk/system/core/include/utils/LinearTransform.h rename to android-headers/19/system/core/include/utils/LinearTransform.h diff --git a/android-headers/android-headers-kk/system/core/include/utils/List.h b/android-headers/19/system/core/include/utils/List.h similarity index 100% rename from android-headers/android-headers-kk/system/core/include/utils/List.h rename to android-headers/19/system/core/include/utils/List.h diff --git a/android-headers/android-headers-kk/system/core/include/utils/Log.h b/android-headers/19/system/core/include/utils/Log.h similarity index 100% rename from android-headers/android-headers-kk/system/core/include/utils/Log.h rename to android-headers/19/system/core/include/utils/Log.h diff --git a/android-headers/android-headers-kk/system/core/include/utils/Looper.h b/android-headers/19/system/core/include/utils/Looper.h similarity index 100% rename from android-headers/android-headers-kk/system/core/include/utils/Looper.h rename to android-headers/19/system/core/include/utils/Looper.h diff --git a/android-headers/android-headers-kk/system/core/include/utils/LruCache.h b/android-headers/19/system/core/include/utils/LruCache.h similarity index 100% rename from android-headers/android-headers-kk/system/core/include/utils/LruCache.h rename to android-headers/19/system/core/include/utils/LruCache.h diff --git a/android-headers/android-headers-kk/system/core/include/utils/Mutex.h b/android-headers/19/system/core/include/utils/Mutex.h similarity index 100% rename from android-headers/android-headers-kk/system/core/include/utils/Mutex.h rename to android-headers/19/system/core/include/utils/Mutex.h diff --git a/android-headers/android-headers-kk/system/core/include/utils/PropertyMap.h b/android-headers/19/system/core/include/utils/PropertyMap.h similarity index 100% rename from android-headers/android-headers-kk/system/core/include/utils/PropertyMap.h rename to android-headers/19/system/core/include/utils/PropertyMap.h diff --git a/android-headers/android-headers-kk/system/core/include/utils/RWLock.h b/android-headers/19/system/core/include/utils/RWLock.h similarity index 100% rename from android-headers/android-headers-kk/system/core/include/utils/RWLock.h rename to android-headers/19/system/core/include/utils/RWLock.h diff --git a/android-headers/android-headers-kk/system/core/include/utils/RefBase.h b/android-headers/19/system/core/include/utils/RefBase.h similarity index 100% rename from android-headers/android-headers-kk/system/core/include/utils/RefBase.h rename to android-headers/19/system/core/include/utils/RefBase.h diff --git a/android-headers/android-headers-kk/system/core/include/utils/SharedBuffer.h b/android-headers/19/system/core/include/utils/SharedBuffer.h similarity index 100% rename from android-headers/android-headers-kk/system/core/include/utils/SharedBuffer.h rename to android-headers/19/system/core/include/utils/SharedBuffer.h diff --git a/android-headers/android-headers-kk/system/core/include/utils/Singleton.h b/android-headers/19/system/core/include/utils/Singleton.h similarity index 100% rename from android-headers/android-headers-kk/system/core/include/utils/Singleton.h rename to android-headers/19/system/core/include/utils/Singleton.h diff --git a/android-headers/android-headers-kk/system/core/include/utils/SortedVector.h b/android-headers/19/system/core/include/utils/SortedVector.h similarity index 100% rename from android-headers/android-headers-kk/system/core/include/utils/SortedVector.h rename to android-headers/19/system/core/include/utils/SortedVector.h diff --git a/android-headers/android-headers-kk/system/core/include/utils/StopWatch.h b/android-headers/19/system/core/include/utils/StopWatch.h similarity index 100% rename from android-headers/android-headers-kk/system/core/include/utils/StopWatch.h rename to android-headers/19/system/core/include/utils/StopWatch.h diff --git a/android-headers/android-headers-kk/system/core/include/utils/String16.h b/android-headers/19/system/core/include/utils/String16.h similarity index 100% rename from android-headers/android-headers-kk/system/core/include/utils/String16.h rename to android-headers/19/system/core/include/utils/String16.h diff --git a/android-headers/android-headers-kk/system/core/include/utils/String8.h b/android-headers/19/system/core/include/utils/String8.h similarity index 100% rename from android-headers/android-headers-kk/system/core/include/utils/String8.h rename to android-headers/19/system/core/include/utils/String8.h diff --git a/android-headers/android-headers-kk/system/core/include/utils/StrongPointer.h b/android-headers/19/system/core/include/utils/StrongPointer.h similarity index 100% rename from android-headers/android-headers-kk/system/core/include/utils/StrongPointer.h rename to android-headers/19/system/core/include/utils/StrongPointer.h diff --git a/android-headers/android-headers-kk/system/core/include/utils/SystemClock.h b/android-headers/19/system/core/include/utils/SystemClock.h similarity index 100% rename from android-headers/android-headers-kk/system/core/include/utils/SystemClock.h rename to android-headers/19/system/core/include/utils/SystemClock.h diff --git a/android-headers/android-headers-kk/system/core/include/utils/Thread.h b/android-headers/19/system/core/include/utils/Thread.h similarity index 100% rename from android-headers/android-headers-kk/system/core/include/utils/Thread.h rename to android-headers/19/system/core/include/utils/Thread.h diff --git a/android-headers/android-headers-kk/system/core/include/utils/ThreadDefs.h b/android-headers/19/system/core/include/utils/ThreadDefs.h similarity index 100% rename from android-headers/android-headers-kk/system/core/include/utils/ThreadDefs.h rename to android-headers/19/system/core/include/utils/ThreadDefs.h diff --git a/android-headers/android-headers-kk/system/core/include/utils/Timers.h b/android-headers/19/system/core/include/utils/Timers.h similarity index 100% rename from android-headers/android-headers-kk/system/core/include/utils/Timers.h rename to android-headers/19/system/core/include/utils/Timers.h diff --git a/android-headers/android-headers-kk/system/core/include/utils/Tokenizer.h b/android-headers/19/system/core/include/utils/Tokenizer.h similarity index 100% rename from android-headers/android-headers-kk/system/core/include/utils/Tokenizer.h rename to android-headers/19/system/core/include/utils/Tokenizer.h diff --git a/android-headers/android-headers-kk/system/core/include/utils/Trace.h b/android-headers/19/system/core/include/utils/Trace.h similarity index 100% rename from android-headers/android-headers-kk/system/core/include/utils/Trace.h rename to android-headers/19/system/core/include/utils/Trace.h diff --git a/android-headers/android-headers-kk/system/core/include/utils/TypeHelpers.h b/android-headers/19/system/core/include/utils/TypeHelpers.h similarity index 100% rename from android-headers/android-headers-kk/system/core/include/utils/TypeHelpers.h rename to android-headers/19/system/core/include/utils/TypeHelpers.h diff --git a/android-headers/android-headers-kk/system/core/include/utils/Unicode.h b/android-headers/19/system/core/include/utils/Unicode.h similarity index 100% rename from android-headers/android-headers-kk/system/core/include/utils/Unicode.h rename to android-headers/19/system/core/include/utils/Unicode.h diff --git a/android-headers/android-headers-kk/system/core/include/utils/UniquePtr.h b/android-headers/19/system/core/include/utils/UniquePtr.h similarity index 100% rename from android-headers/android-headers-kk/system/core/include/utils/UniquePtr.h rename to android-headers/19/system/core/include/utils/UniquePtr.h diff --git a/android-headers/android-headers-kk/system/core/include/utils/Vector.h b/android-headers/19/system/core/include/utils/Vector.h similarity index 100% rename from android-headers/android-headers-kk/system/core/include/utils/Vector.h rename to android-headers/19/system/core/include/utils/Vector.h diff --git a/android-headers/android-headers-kk/system/core/include/utils/VectorImpl.h b/android-headers/19/system/core/include/utils/VectorImpl.h similarity index 100% rename from android-headers/android-headers-kk/system/core/include/utils/VectorImpl.h rename to android-headers/19/system/core/include/utils/VectorImpl.h diff --git a/android-headers/android-headers-kk/system/core/include/utils/ashmem.h b/android-headers/19/system/core/include/utils/ashmem.h similarity index 100% rename from android-headers/android-headers-kk/system/core/include/utils/ashmem.h rename to android-headers/19/system/core/include/utils/ashmem.h diff --git a/android-headers/android-headers-kk/system/core/include/utils/misc.h b/android-headers/19/system/core/include/utils/misc.h similarity index 100% rename from android-headers/android-headers-kk/system/core/include/utils/misc.h rename to android-headers/19/system/core/include/utils/misc.h diff --git a/android-headers/android-headers-kk/system/core/include/utils/threads.h b/android-headers/19/system/core/include/utils/threads.h similarity index 100% rename from android-headers/android-headers-kk/system/core/include/utils/threads.h rename to android-headers/19/system/core/include/utils/threads.h diff --git a/compile.sh b/compile.sh index 3b5a95b4d..4523f6f9b 100755 --- a/compile.sh +++ b/compile.sh @@ -396,12 +396,7 @@ make $MAKEFLAGS echo "Building VLC for Android" cd ../../ -export ANDROID_SYS_HEADERS_GINGERBREAD=${PWD}/android-headers/android-headers-gingerbread -export ANDROID_SYS_HEADERS_HC=${PWD}/android-headers/android-headers-hc -export ANDROID_SYS_HEADERS_ICS=${PWD}/android-headers/android-headers-ics -export ANDROID_SYS_HEADERS_JB=${PWD}/android-headers/android-headers-jb -export ANDROID_SYS_HEADERS_JBMR2=${PWD}/android-headers/android-headers-jbmr2 -export ANDROID_SYS_HEADERS_KK=${PWD}/android-headers/android-headers-kk +export ANDROID_SYS_HEADERS=${PWD}/android-headers export ANDROID_LIBS=${PWD}/android-libs export VLC_BUILD_DIR=vlc/build-android-${TARGET_TUPLE} @@ -441,12 +436,7 @@ export ANDROID_SDK=$ANDROID_SDK export ANDROID_NDK=$ANDROID_NDK export GCCVER=$GCCVER export CXXSTL=$CXXSTL -export ANDROID_SYS_HEADERS_GINGERBREAD=$ANDROID_SYS_HEADERS_GINGERBREAD -export ANDROID_SYS_HEADERS_HC=$ANDROID_SYS_HEADERS_HC -export ANDROID_SYS_HEADERS_ICS=$ANDROID_SYS_HEADERS_ICS -export ANDROID_SYS_HEADERS_JB=$ANDROID_SYS_HEADERS_JB -export ANDROID_SYS_HEADERS_JBMR2=$ANDROID_SYS_HEADERS_JBMR2 -export ANDROID_SYS_HEADERS_KK=$ANDROID_SYS_HEADERS_KK +export ANDROID_SYS_HEADERS=$ANDROID_SYS_HEADERS export ANDROID_LIBS=$ANDROID_LIBS export VLC_BUILD_DIR=$VLC_BUILD_DIR export TARGET_TUPLE=$TARGET_TUPLE diff --git a/libvlc/jni/Android.mk b/libvlc/jni/Android.mk index b93424464..bb8112099 100644 --- a/libvlc/jni/Android.mk +++ b/libvlc/jni/Android.mk @@ -88,35 +88,35 @@ LIBIOMX_INCLUDES_COMMON := $(VLC_SRC_DIR)/modules/codec/omxil # no hwbuffer for gingerbread LIBIOMX_INCLUDES_10 := $(LIBIOMX_INCLUDES_COMMON) \ - $(ANDROID_SYS_HEADERS_GINGERBREAD)/frameworks/base/include \ - $(ANDROID_SYS_HEADERS_GINGERBREAD)/system/core/include \ - $(ANDROID_SYS_HEADERS_GINGERBREAD)/hardware/libhardware/include + $(ANDROID_SYS_HEADERS)/10/frameworks/base/include \ + $(ANDROID_SYS_HEADERS)/10/system/core/include \ + $(ANDROID_SYS_HEADERS)/10/hardware/libhardware/include LIBIOMX_INCLUDES_13 := $(LIBIOMX_INCLUDES_COMMON) \ - $(ANDROID_SYS_HEADERS_HC)/frameworks/base/include \ - $(ANDROID_SYS_HEADERS_HC)/frameworks/base/native/include \ - $(ANDROID_SYS_HEADERS_HC)/system/core/include \ - $(ANDROID_SYS_HEADERS_HC)/hardware/libhardware/include + $(ANDROID_SYS_HEADERS)/13/frameworks/base/include \ + $(ANDROID_SYS_HEADERS)/13/frameworks/base/native/include \ + $(ANDROID_SYS_HEADERS)/13/system/core/include \ + $(ANDROID_SYS_HEADERS)/13/hardware/libhardware/include LIBIOMX_INCLUDES_14 := $(LIBIOMX_INCLUDES_COMMON) \ - $(ANDROID_SYS_HEADERS_ICS)/frameworks/base/include \ - $(ANDROID_SYS_HEADERS_ICS)/frameworks/base/native/include \ - $(ANDROID_SYS_HEADERS_ICS)/system/core/include \ - $(ANDROID_SYS_HEADERS_ICS)/hardware/libhardware/include + $(ANDROID_SYS_HEADERS)/14/frameworks/base/include \ + $(ANDROID_SYS_HEADERS)/14/frameworks/base/native/include \ + $(ANDROID_SYS_HEADERS)/14/system/core/include \ + $(ANDROID_SYS_HEADERS)/14/hardware/libhardware/include LIBIOMX_SRC_FILES_18 := $(LIBIOMX_SRC_FILES_COMMON) $(LIBIOMX_SRC_FILES_HWBUFFER) LIBIOMX_INCLUDES_18 := $(LIBIOMX_INCLUDES_COMMON) \ - $(ANDROID_SYS_HEADERS_JBMR2)/frameworks/native/include \ - $(ANDROID_SYS_HEADERS_JBMR2)/frameworks/av/include \ - $(ANDROID_SYS_HEADERS_JBMR2)/system/core/include \ - $(ANDROID_SYS_HEADERS_JBMR2)/hardware/libhardware/include + $(ANDROID_SYS_HEADERS)/18/frameworks/native/include \ + $(ANDROID_SYS_HEADERS)/18/frameworks/av/include \ + $(ANDROID_SYS_HEADERS)/18/system/core/include \ + $(ANDROID_SYS_HEADERS)/18/hardware/libhardware/include LIBIOMX_SRC_FILES_19 := $(LIBIOMX_SRC_FILES_COMMON) $(LIBIOMX_SRC_FILES_HWBUFFER) LIBIOMX_INCLUDES_19 := $(LIBIOMX_INCLUDES_COMMON) \ - $(ANDROID_SYS_HEADERS_KK)/frameworks/native/include \ - $(ANDROID_SYS_HEADERS_KK)/frameworks/av/include \ - $(ANDROID_SYS_HEADERS_KK)/system/core/include \ - $(ANDROID_SYS_HEADERS_KK)/hardware/libhardware/include + $(ANDROID_SYS_HEADERS)/19/frameworks/native/include \ + $(ANDROID_SYS_HEADERS)/19/frameworks/av/include \ + $(ANDROID_SYS_HEADERS)/19/system/core/include \ + $(ANDROID_SYS_HEADERS)/19/hardware/libhardware/include define build_iomx include $(CLEAR_VARS)