22.1.0

All missed AOSPA commits up to the latest 9-Apr-2013 commit

Change-Id: I2e75e28ebe470ed4a007382b3c8b089b1a6d285b