fixes (?)

Change-Id: Ie1387eaaf9f4d39e1801df968ba2730b038903dd
Signed-off-by: klozz <xxx.reptar.rawrr.xxx@gmail.com>
Merge https://github.com/klozz/frameworks_base into HEAD