Snap for 4598635 from d00f0096cde99519145655998cc60697013504fa to pi-release

Change-Id: Id86e9b6236311e218c82c31c0e82ee89263afd48
tree: 444b5d4f1df3cd62e66943c44c12d3fdf8ac1ee3
  1. bluetooth/
  2. vndk/