Merge "Remove libz from vndk-sp list for non-VNDK-enforced devices" am: e20a58f574
am: 7e472f08ae

Change-Id: I3620f1cd1e00e6f4895c65a4abc993936cf5ea67
tree: fa4bd261253582d90412b9392ce7c9f769c6edba
  1. bluetooth/
  2. vndk/