more fixes

Change-Id: Ideb318f17df4469e114a57e64358b978e3dd5a0c
Merge branch 'du44' of https://github.com/sileshn/frameworks_base-du into du44