New branch to merge everything until 31/05/2010 from aosp

Change-Id: Ia6c1538c12ba7b339acb4b1ce1d70516081c486f