Merge "Fix broke NDK sensor manager API" into mnc-dev

using android::SensorManager;

using android::SensorEventQueue;

using android::String8;

using android::String16;

/*****************************************************************************/

android::Mutex android::SensorManager::sLock;

std::map<String16, SensorManager*> android::SensorManager::sPackageInstances;

ASensorManager* ASensorManager_getInstance()

{

    return ASensorManager_getInstanceForPackage(NULL);

}

ASensorManager* ASensorManager_getInstanceForPackage(const char* packageName)

{

    if (packageName) {

        return &SensorManager::getInstanceForPackage(String16(packageName));

    } else {

        return &SensorManager::getInstanceForPackage(String16());

    }

}

int ASensorManager_getSensorList(ASensorManager* manager,

        ASensorList* list)

{