am 1d34ab0c: Merge "Fix Manifest for support-v13 aar." into klp-modular-dev

* commit '1d34ab0c503372b371324ee77914e093be1e9250':
  Fix Manifest for support-v13 aar.