Fix derps

Change-Id: Ib3ce127f403c146dbc9497426bb5274c61e62192
Merge branch 'maple' of github.com:MapleROM/frameworks_base into maple