Merge changes from topic "manifest_fixer_target_sdk_version"

* changes:
  Make manifest_fixer.py keep targetSdkVersion high with LOCAL_MIN_SDK_VERSION
  Fix setting PRIVATE_MIN_SDK_VERSION on fixed_android_manifest