Stay on safe side, use only one header file.
Other header is located at xbmc/linux/ and seem to be more accurate.
droid: add builtin for executing android apps via applicationmanager
[droid] attach/detach the jvm using thread storage

Threads are automatically attached when issuing a xbmc_jnienv(), and detach
automatically at destruction.

This eliminates manual intervention, and likely will save us from some bugs in
the future. The old code was very difficult to maintain since every function
had to assume that it was not attached and had to detach when finished.

This is the method recommended in the Android docs.
AE: Revisit Device Opening. Try to set periodSize of 100 ms and BufferSize of 800 ms
Merge pull request #2319 from theuni/jni-thread-storage

[droid] attach/detach the jvm using thread storage
Merge pull request #2322 from theuni/android-app-builtin

droid: add builtin for executing android apps via applicationmanager
[keymap] Added two 360 controllers: "Wireless Gamepad F710 (Controller)" and "Afterglow Gamepad for Xbox 360 (Controller)"
[peripherals] fixed CPeripheral::operator ==(const PeripheralScanResult& right)
[cec] make the 'missing libCEC support' warning show up again
Merge pull request #2236 from stupid-boy/DllOmx_h

[RPI,OMX] Delete duplicated DllOMX.h header file
Merge pull request #2320 from fritsch/ae-period-size

AE: Revisit Period Size, Period and Buffersize
Merge remote-tracking branch 'origin/master' into android-neon-xaf-touch

Conflicts:
	xbmc/interfaces/Builtins.cpp