More cleanup & switch to 4.3/cm-10.2 branches

Change-Id: I3a648b44cf82c3b1b1b1218f36d7f3e97c4f71af