use merged device repo and back to slimroms framwork_av

Change-Id: I88c09251efc1c8864e206ef66f1f07ac7b0d6655