fix

Change-Id: If527c6de2c30968414273521fbc9afa329aa3ba5
Merge branch 'mafut' of https://github.com/nelo360/frameworks_base into mafut