am 954a5e60: am e7f8140e: am 7978d50e: Add a workaround for a platform JAR parsing bug.

Merge commit '954a5e606ba6af5aef514c2c4c0d3ea2554b48f9'

* commit '954a5e606ba6af5aef514c2c4c0d3ea2554b48f9':
  Add a workaround for a platform JAR parsing bug.