Merge erikcas GPS, overlay and ramdisk changes

Change-Id: If509b84319c2c6e9f6fd1ed2357e46c806b3dc9e