remove assets dir

Change-Id: I3f7d4dd3198cb2f42067e9f8466c9d6faa5089ad
update to lollipop

Change-Id: I89a511c472fd4e02ace8abe8dbccb6d7473e156a