cleanup common tree

Change-Id: I2634b669bf8ed8118496c0b2519c6c60dbadd01d
AOKP changes

Change-Id: I265e6f588437db50e157182c4040ce2c9076eef6