[automerger skipped] Merge "Don't feed framework.jar to proguard for vendor...
[automerger skipped] Merge "Don't feed framework.jar to proguard for vendor apks" into qt-dev am: 4a6b93ba -s ours
am: 8ac1fad2 -s ours
am skip reason: change_id If2b658fead5b4bb4d8c023a37eb57a37ad9b741d with SHA1 eadd1bdb is in history
Change-Id: Ief65d47ea979c5d6db8d14058aeb8985059dae53