am 2b57e4b5: (-s ours) am 7bc99850: am f2594a93: am 512d09d3: (-s ours) am 9bffd1e9: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '2b57e4b5e2d5e51d1c5c5d0e84a86c7344538481':
am 6dc0a302: Use dumpstate directly for bugreports.

* commit '6dc0a30201dc8cc61b283a65b88c57e860fb8e4f':
  Use dumpstate directly for bugreports.
am 9a8c10ad: Rename AOSP builds to aosp_*

* commit '9a8c10ad31d333918b80b3939f285f9bbc4df6a6':
  Rename AOSP builds to aosp_*
am f8044e63: Sensors: Update authority for iio attributes in init.tilapia.rc.

* commit 'f8044e63a385586fb6174508b20d3404917b0f30':
  Sensors: Update authority for iio attributes in init.tilapia.rc.
am 7c71b767: Revert "Sensors: Update authority for iio attributes in init.tilapia.rc."

* commit '7c71b767f9af5e7a6cddad066acbc52fe1a89426':
  Revert "Sensors: Update authority for iio attributes in init.tilapia.rc."
am a6518497: Revert "Revert "Sensors: Update authority for iio attributes in init.tilapia.rc.""

* commit 'a651849743e1b498eb6a0b7e548837ce58224369':
  Revert "Revert "Sensors: Update authority for iio attributes in init.tilapia.rc.""
am 10ad0b8b: Remove deprecated recovery.fstab

* commit '10ad0b8b490663d65dd1fca4ab1345eb63e6c76d':
  Remove deprecated recovery.fstab
am 971306d1: Remove the ext4 discard mount option.

* commit '971306d13cc95cdf7b60d5a1bafaddb216361a58':
  Remove the ext4 discard mount option.
am a0631b25: tilapia: wlan: Add wpa_supplicant overlay file support

* commit 'a0631b255932a2d4fc63b936051849b86b144e21':
  tilapia: wlan: Add wpa_supplicant overlay file support
am a2e79fae: Remove wifi_p2p network.

* commit 'a2e79fae23c5d5178ec7c534bd488eacc5d098ec':
  Remove wifi_p2p network.
Use common makefile style.

Also remove an extra parenthese that shouldn't have been there.

Change-Id: I821c7591afe1c66aaa3275273d09cd37f03ff63c
Merge "Use common makefile style." into jb-mr2-dev-plus-aosp
am 1f57a6a5: Merge "Use common makefile style." into jb-mr2-dev-plus-aosp

* commit '1f57a6a539834a0b97e8e0d4725b95b197de04ca':
  Use common makefile style.
Disable OpenGL preloading with Tegra drivers

apparently grouper and tilapia do not share basic configs

Bug: 8888857
Change-Id: I41f15a4dc9d22f55044ff2fa8ae9e158d5dc5e50
Reconcile with jb-mr2-release - do not merge

Change-Id: I01161d374f2eb4ffae81b9ee495beef4331db829
am 3392bd9e: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit '3392bd9e2b54afaa7d935e1753c3a9e879b51890':
  tilapia: wlan: Add wpa_supplicant overlay file support
Update filelist for JB-MR2

Change-Id: If507f17fada8792f32ee27d4d3d51e4b5868d5d0
Self-extractors for JWR50

Change-Id: I5984c5a2b4f89f3c0b8442ac485ab038c8569f13
am ff53f8c6: Update filelist for JB-MR2

* commit 'ff53f8c63579af1b5310036efab42607a6a987d9':
  Update filelist for JB-MR2
am b8860d3f: Self-extractors for JWR50

* commit 'b8860d3fabd6fcabf1ecdd53dd1f9a7f53e7dd81':
  Self-extractors for JWR50