Better error reporting in mktargets.py
use overwrite for scene change detector
Fix Android build setting minSdkVersion

Beside changing line endings in (see: 973a16) it's also
required to set a minimum Sdk version in the manifest
Merge pull request #568 from ylatuya/android

Fix Android build setting minSdkVersion
Merge pull request #565 from varunbpatil/errstr

Better error reporting in mktargets.py
fix android build for mini-sdk virsion issue
Merge pull request #569 from volvet/fix-android-build

fix android build for mini-sdk virsion issue
Merge pull request #566 from volvet/develop_b

use overwrite for scene change detector
add complexity calculation parameter for screen content
Merge pull request #571 from ruil2/encoder_nal

add complexity calculation parameter for screen content
Change the output of diamond search from qpel to interpel
Merge pull request #572 from sijchen/me_merge62

[Encoder ME] Change the output of diamond search from qpel to interpel
Merge remote-tracking branch 'upstream/master' into travis.osx