Update to 3.6 Build against 3.6.0 and test against 3.6.8. Change-Id: I32579d0d894d41073c34a3b129fc189b74e43e1f