u8500: Other AOSP Changes

Change-Id: If3c823d9640829716724d452884ce8193479f5f2