am fc6d9c57: am 06fba2bf: resolved conflicts for merge of 2e537299 to jb-dev-plus-aosp

* commit 'fc6d9c57b10ed1445360eed87deedaa4e4734f38':
  Update blob list, add matching self-extractors