update

Change-Id: Ifbf28f69bef08951075d524982a884162d85bcc0
Merge branch 'test' of https://github.com/BMc08GT/frameworks_base into test