Merge "NdkMediaFormat.h: Updated to include Android API macros"

#include <sys/cdefs.h>

#include <sys/types.h>

#ifndef __ANDROID__

// Value copied from 'bionic/libc/include/android/api-level.h' which is not available on

// non Android systems. It is set to 10000 which is same as __ANDROID_API_FUTURE__ value.

#ifndef __ANDROID_API__

#define __ANDROID_API__ 10000

#endif

// Value copied from 'bionic/libc/include/android/versioning.h' which is not available on

// non Android systems

#ifndef __INTRODUCED_IN

#define __INTRODUCED_IN(api_level)

#endif

#endif

#include "NdkMediaError.h"

__BEGIN_DECLS