22.3.0

All left over AOKP commits up to 03/22/2013

Change-Id: If801522be8e95c0c62b668b7980bdde9a1edddc4