Merge changes I23d0ab25,I8e8823d5

* changes:
  Adding a method to enable or disable carrier aggregation
  Allow set_simulation_model to set up to 5 base stations
tree: e8b6eb9485ae1d945732e902cadc5cc4d23292cd
  1. acts/
  2. tools/
  3. wts-acts/
  4. Android.mk
  5. OWNERS
  6. PREUPLOAD.cfg