Merge "Use consistent naming for allocating SPI." am: 816f0ebaab
am: 4753ed4b1b

Change-Id: Ib5d89044313341790b1ee9271642072ddce181af
tree: 4969ba0484cd5a2ab610fdf56454ef8886c24c06
  1. core/
  2. services/
  3. wifi/