Update the definition of SDK 6, remove all new APIs from it. Change-Id: Id96827f630ab46279d9ad8d3f7498e5515e0a688
Um okay, that was dumb. And I guess this means it is time to make 6.xml. Change-Id: Ic42763b1c8a13448cf6db20b4cd6daadc7786ac1