am bf0a9c4a: am cc80f5a1: Merge "Fix partition_tag usage in install_jni_libs"

* commit 'bf0a9c4ac842f340f4d995205999ed472b124f17':
  Fix partition_tag usage in install_jni_libs