Switch Keon to master on gecko and gaia

Change-Id: I42e993b006c999e7bd96af60761f4642d3cc1849