Merge changes I6f869824,Ie4d28bf5 into main

* changes:
  Move phone specific stuff into phone.mk
  Remove window_extensions.mk from tablet...mk files