am b25a6936: am d7043f00: Merge "Add hidden minor version ID for support lib workarounds."

* commit 'b25a6936a1b0dbabaf8ad8c2ce59e7251daa9e8c':
  Add hidden minor version ID for support lib workarounds.