Revert "Use 4.8 for kernel, 4.9 for ROM"

This reverts commit f58ed0210c5e5dd6c9bc5b4b7f68941d59acacab.

Change-Id: I61c2143386852a5b2530536e0c03afa243d9412b