Merge changes Ie7e60128,I1a648227

* changes:
  Move AIDL library from shared to static for BT VTS
  Add bluetooth VTS to TEST_MAPPING