jflte: sync with TheMuppets

Change-Id: Ib8eb492840c75ac6bd3b17f3fb272acf949bfe2f