Fix bad merge

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