Merge changes from topic "manifest_fixer_targetSdkVersion"

* changes:
  Pass --library to manifest_fixer.py for android libraries
  Fix dependencies for obfuscated instrumentation tests
  Move manifest fixing to a separate rule